From 887803d9abf32c5f9de89110ed55d96a4340c513 Mon Sep 17 00:00:00 2001 From: Alan <37482427+alemon-aquaveo@users.noreply.github.com> Date: Sat, 13 Jul 2024 16:12:19 -0600 Subject: [PATCH] -update version -fix bug related to Z values on the input polygon. We want all Z values to be at 0.0 when using the paving algorithm. -added a test for this bug -added a test for a patch where we want to fill the Z values based on the input polygon Z values (so we don't break this functionality) --- _package/xms/mesher/__init__.py | 2 +- test_files/meshing/CasePatch7.txt | 35 + test_files/meshing/CasePatch7_base.2dm | 117 ++ test_files/meshing/bug15246.txt | 314 ++++ test_files/meshing/bug15246_base.2dm | 2086 +++++++++++++++++++++++ xmsmesher/meshing/MeMultiPolyMesher.cpp | 20 +- xmsmesher/meshing/MeMultiPolyTo2dm.cpp | 15 + xmsmesher/meshing/MeMultiPolyTo2dm.t.h | 2 + xmsmesher/meshing/MePolyMesher.cpp | 40 +- xmsmesher/tutorial/TutMeshing.cpp | 10 +- 10 files changed, 2629 insertions(+), 12 deletions(-) create mode 100644 test_files/meshing/CasePatch7.txt create mode 100644 test_files/meshing/CasePatch7_base.2dm create mode 100644 test_files/meshing/bug15246.txt create mode 100644 test_files/meshing/bug15246_base.2dm diff --git a/_package/xms/mesher/__init__.py b/_package/xms/mesher/__init__.py index 81218455..0289ba98 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.1.1' +__version__ = '5.1.3' diff --git a/test_files/meshing/CasePatch7.txt b/test_files/meshing/CasePatch7.txt new file mode 100644 index 00000000..2d84a070 --- /dev/null +++ b/test_files/meshing/CasePatch7.txt @@ -0,0 +1,35 @@ +BEGIN_POLYGON +OUTSIDE_3D 30 +0.0 0.0 0.0 +0.0 10.0 -5.0 +0.0 20.0 -10.0 +0.0 30.0 -10.0 +0.0 40.0 -5.0 +0.0 50.0 0.0 +15.0 50.0 0.0 +30.0 50.0 0.0 +45.0 50.0 0.0 +60.0 50.0 0.0 +75.0 50.0 0.0 +90.0 50.0 0.0 +105.0 50.0 0.0 +120.0 50.0 0.0 +135.0 50.0 0.0 +150.0 50.0 0.0 +150.0 40.0 -5.0 +150.0 30.0 -10.0 +150.0 20.0 -10.0 +150.0 10.0 -5.0 +150.0 0.0 0.0 +135.0 0.0 0.0 +120.0 0.0 0.0 +105.0 0.0 0.0 +90.0 0.0 0.0 +75.0 0.0 0.0 +60.0 0.0 0.0 +45.0 0.0 0.0 +30.0 0.0 0.0 +15.0 0.0 0.0 +PATCH_CORNERS 5 15 20 +END_POLYGON +RETURN_CELL_POLYGONS diff --git a/test_files/meshing/CasePatch7_base.2dm b/test_files/meshing/CasePatch7_base.2dm new file mode 100644 index 00000000..2fde440d --- /dev/null +++ b/test_files/meshing/CasePatch7_base.2dm @@ -0,0 +1,117 @@ +MESH2D +E4Q 1 1 2 14 13 1 +E4Q 2 2 3 15 14 1 +E4Q 3 3 4 16 15 1 +E4Q 4 4 5 17 16 1 +E4Q 5 5 6 18 17 1 +E4Q 6 7 61 62 8 1 +E4Q 7 8 62 63 9 1 +E4Q 8 9 63 64 10 1 +E4Q 9 10 64 65 11 1 +E4Q 10 11 65 66 12 1 +E4Q 11 13 14 20 19 1 +E4Q 12 14 15 21 20 1 +E4Q 13 15 16 22 21 1 +E4Q 14 16 17 23 22 1 +E4Q 15 17 18 24 23 1 +E4Q 16 19 20 26 25 1 +E4Q 17 20 21 27 26 1 +E4Q 18 21 22 28 27 1 +E4Q 19 22 23 29 28 1 +E4Q 20 23 24 30 29 1 +E4Q 21 25 26 32 31 1 +E4Q 22 26 27 33 32 1 +E4Q 23 27 28 34 33 1 +E4Q 24 28 29 35 34 1 +E4Q 25 29 30 36 35 1 +E4Q 26 31 32 38 37 1 +E4Q 27 32 33 39 38 1 +E4Q 28 33 34 40 39 1 +E4Q 29 34 35 41 40 1 +E4Q 30 35 36 42 41 1 +E4Q 31 37 38 44 43 1 +E4Q 32 38 39 45 44 1 +E4Q 33 39 40 46 45 1 +E4Q 34 40 41 47 46 1 +E4Q 35 41 42 48 47 1 +E4Q 36 43 44 50 49 1 +E4Q 37 44 45 51 50 1 +E4Q 38 45 46 52 51 1 +E4Q 39 46 47 53 52 1 +E4Q 40 47 48 54 53 1 +E4Q 41 49 50 56 55 1 +E4Q 42 50 51 57 56 1 +E4Q 43 51 52 58 57 1 +E4Q 44 52 53 59 58 1 +E4Q 45 53 54 60 59 1 +E4Q 46 55 56 62 61 1 +E4Q 47 56 57 63 62 1 +E4Q 48 57 58 64 63 1 +E4Q 49 58 59 65 64 1 +E4Q 50 59 60 66 65 1 +ND 1 0.0 50.0 0.0 +ND 2 0.0 40.0 -5.0 +ND 3 0.0 30.0 -10.0 +ND 4 0.0 20.0 -10.0 +ND 5 0.0 10.0 -5.0 +ND 6 0.0 0.0 0.0 +ND 7 150.0 50.0 0.0 +ND 8 150.0 40.0 -5.0 +ND 9 150.0 30.0 -10.0 +ND 10 150.0 20.0 -10.0 +ND 11 150.0 10.0 -5.0 +ND 12 150.0 0.0 0.0 +ND 13 15.0 50.0 0.0 +ND 14 15.0 40.0 -5.0 +ND 15 15.0 30.0 -10.0 +ND 16 15.0 20.0 -10.0 +ND 17 15.0 10.0 -5.0 +ND 18 15.0 0.0 0.0 +ND 19 30.0 50.0 0.0 +ND 20 30.0 40.0 -5.0 +ND 21 30.0 30.0 -10.0 +ND 22 30.0 20.0 -10.0 +ND 23 30.0 10.0 -5.0 +ND 24 30.0 0.0 0.0 +ND 25 45.0 50.0 0.0 +ND 26 45.0 40.0 -5.0 +ND 27 45.0 30.0 -10.0 +ND 28 45.0 20.0 -10.0 +ND 29 45.0 10.0 -5.0 +ND 30 45.0 0.0 0.0 +ND 31 60.0 50.0 0.0 +ND 32 60.0 40.0 -5.0 +ND 33 60.0 30.0 -10.0 +ND 34 60.0 20.0 -10.0 +ND 35 60.0 10.0 -5.0 +ND 36 60.0 0.0 0.0 +ND 37 75.0 50.0 0.0 +ND 38 75.0 40.0 -5.0 +ND 39 75.0 30.0 -10.0 +ND 40 75.0 20.0 -10.0 +ND 41 75.0 10.0 -5.0 +ND 42 75.0 0.0 0.0 +ND 43 90.0 50.0 0.0 +ND 44 90.0 40.0 -5.0 +ND 45 90.0 30.0 -10.0 +ND 46 90.0 20.0 -10.0 +ND 47 90.0 10.0 -5.0 +ND 48 90.0 0.0 0.0 +ND 49 105.0 50.0 0.0 +ND 50 105.0 40.0 -5.0 +ND 51 105.0 30.0 -10.0 +ND 52 105.0 20.0 -10.0 +ND 53 105.0 10.0 -5.0 +ND 54 105.0 0.0 0.0 +ND 55 120.0 50.0 0.0 +ND 56 120.0 40.0 -5.0 +ND 57 120.0 30.0 -10.0 +ND 58 120.0 20.0 -10.0 +ND 59 120.0 10.0 -5.0 +ND 60 120.0 0.0 0.0 +ND 61 135.0 50.0 0.0 +ND 62 135.0 40.0 -5.0 +ND 63 135.0 30.0 -10.0 +ND 64 135.0 20.0 -10.0 +ND 65 135.0 10.0 -5.0 +ND 66 135.0 0.0 0.0 diff --git a/test_files/meshing/bug15246.txt b/test_files/meshing/bug15246.txt new file mode 100644 index 00000000..f1045d36 --- /dev/null +++ b/test_files/meshing/bug15246.txt @@ -0,0 +1,314 @@ +BEGIN_POLYGON +OUTSIDE_3D 148 +2638521.3763371999 610623.22506488999 1167.5181355646000 +2638527.9380038986 610526.89019161416 1164.5357044701495 +2638503.6456194133 610473.42588678969 1164.5036598140734 +2638488.6497739153 610386.08816792478 1163.4062672469684 +2638547.6230038987 610311.46287500160 1165.7333530594174 +2638503.3030658313 610249.98666654108 1166.9735600280928 +2638439.4940823084 610245.23268301808 1165.9162557590835 +2638350.0114384033 610222.12827127508 1166.5071688865110 +2638255.2093062247 610211.86624026776 1162.4159187865732 +2638252.3480038987 610113.99862589792 1162.0438991301085 +2638258.9096705653 610017.66375262348 1161.9853228401259 +2638265.4713372318 609921.32887934917 1161.9450607257281 +2638265.4713372318 609822.27607474977 1162.2320798204730 +2638274.9053209997 609727.13095417432 1163.5211484142685 +2638248.1244527921 609644.70160460833 1163.4660748308324 +2638162.0237834058 609613.43238411541 1163.1940512179349 +2638074.6860645409 609585.14966525068 1163.6468306287898 +2637991.7350088703 609546.27660460840 1163.9012743450439 +2637911.5418328359 609500.74543354579 1162.9241794955392 +2637831.8915846543 609453.90351869713 1163.3462860670775 +2637754.3710842244 609401.91993794171 1163.4782280118732 +2637678.3566913032 609346.30029201298 1163.7923479446038 +2637607.1899774591 609288.25691150199 1164.1862169258770 +2637533.3053322895 609227.49559966603 1164.0839025121677 +2637467.9042214579 609155.53282216750 1164.0897195355092 +2637397.8633116297 609085.49191233981 1164.1983168894772 +2637344.4597301148 609012.40333082469 1164.4777572156099 +2637286.4163496038 608941.23661698075 1164.8388436231205 +2637239.5744347558 608861.58636879898 1165.1131182035213 +2637183.4529219158 608785.77985595877 1164.1914943700037 +2637141.2508060634 608704.20774010639 1165.2485158453774 +2637108.3282882026 608618.79188891232 1165.5899662856275 +2637070.7659713463 608535.29790538922 1165.5372238178347 +2637037.8434534855 608449.88205419527 1165.5374647478932 +2637000.2811366292 608366.38807067182 1165.1231761734039 +2636971.9984177640 608279.05035180727 1166.4037638695072 +2636933.4530038987 608195.96358039801 1166.2762680134656 +2636901.5135830468 608110.14051708998 1167.0307862958271 +2636874.3980038986 608022.31935312541 1167.4821525158807 +2636840.3083463213 607937.38694703125 1168.1737144316558 +2636807.3858284606 607851.97109583719 1168.5335961688036 +2636774.4633106003 607766.55524464312 1168.6732910917776 +2636736.9009937434 607683.06126111990 1169.1255190230122 +2636703.9784758999 607597.64540993003 1169.5020575369001 +2636692.2449522782 607500.36736218620 1160.7090708069625 +2636679.8333275001 607397.46744357003 1151.4079217824001 +2636568.8569938941 607410.68383330433 1151.5280880301800 +2636431.0405339054 607374.39433239971 1151.4649866483005 +2636340.5277220290 607301.88995967456 1151.4534498044668 +2636268.7227445943 607257.08894013299 1151.6801869040048 +2636190.4599328064 607232.04279479163 1151.9740199821695 +2636115.7201273479 607217.90606677800 1152.0133624114919 +2636046.1387822796 607216.09740484564 1152.4462209950225 +2635964.5709180343 607224.71389824594 1152.3858810852660 +2635884.8911157185 607245.16907605878 1152.4977289912372 +2635811.0544186262 607278.50684522302 1152.5789825234247 +2635745.3725141166 607319.84425224434 1152.0128399439081 +2635686.1104524811 607371.96825655282 1151.7590022924298 +2635634.8443540591 607436.39331060275 1152.2038825106813 +2635581.5019005914 607513.92271028494 1151.0883861196398 +2635536.6102424287 607591.55467710830 1151.1995696081506 +2635497.9031578265 607670.85100519331 1151.7415570295032 +2635461.6898876135 607754.90039317601 1152.2360013122325 +2635428.7574495156 607840.10425586614 1152.2934629487943 +2635400.8379591051 607924.51420986908 1151.8094329684352 +2635381.8873091401 608006.71884618187 1151.3632081230828 +2635363.0811617929 608107.19700087863 1150.9340486511680 +2635346.4062575605 608197.83856787300 1152.0796989927826 +2635330.2605995750 608284.97420357761 1150.8319725671586 +2635326.4499381133 608371.21870329999 1152.0920741065502 +2635319.5106463507 608476.62477959215 1152.4675096269575 +2635311.3150033643 608573.69190309127 1152.2585789414020 +2635307.9024586873 608666.94504858775 1152.5138047561288 +2635310.2514153160 608765.08077089244 1152.7851037260375 +2635310.0779465884 608862.10255366517 1153.0816553180171 +2635319.3471362786 608953.70995716529 1152.3799902541314 +2635328.0533181494 609064.02946533042 1152.7167613078436 +2635331.9792119544 609164.06359170133 1152.3289268530707 +2635329.2746361629 609265.80502293515 1152.6636745440287 +2635336.1738457689 609350.35051927925 1152.9740423838987 +2635356.2410465204 609439.97063314822 1152.7534269199050 +2635365.9124136483 609570.21656702762 1152.4763880627302 +2635357.5412012003 609663.07665549731 1152.5844633983575 +2635355.1951322220 609759.82353577495 1152.2183137437248 +2635366.0504855225 609854.81332071696 1153.6808575199068 +2635357.9391578557 609978.67099023494 1152.3420552584919 +2635335.1366377999 610081.89400118974 1152.1376510957866 +2635320.8490323629 610173.51195141510 1152.1744455258622 +2635307.1474958444 610273.14675281534 1153.7626783689304 +2635301.0509709525 610373.62980941741 1153.2674254102103 +2635291.3152869749 610474.57532968232 1153.9283198739438 +2635279.8291400550 610581.52079791436 1154.0637444749225 +2635260.3881672928 610684.41221487871 1153.0152530261148 +2635228.0105619896 610794.76302053849 1152.6661504438575 +2635187.1026121364 610901.33466023358 1154.3066794514984 +2635133.4976102598 610997.71419182746 1153.4090048586702 +2635074.5850444422 611086.84238798916 1153.6461804500454 +2635016.4160064696 611171.24530968769 1153.4815865230009 +2634957.0441652206 611251.61471996910 1154.1317040128706 +2634900.1856386401 611334.95869901055 1154.4652359480654 +2634835.1293602269 611425.75400907546 1154.0910570282640 +2634763.1715866872 611509.37470294943 1152.0861522628652 +2634705.6266439012 611582.06004854455 1152.7236173821511 +2634642.1226356137 611663.48493401741 1153.3742419282466 +2634580.8086167239 611739.38146190043 1154.0221980043439 +2634521.0848032604 611806.77224166587 1153.5231401125575 +2634468.0306746121 611870.67432655999 1153.9700133836222 +2634424.9217054849 611933.91486467351 1154.3783533499097 +2634402.9262536429 611986.68610368227 1154.6597890561884 +2634389.8163050539 612067.03485484153 1154.3518598771029 +2634370.2308165487 612187.52715855977 1153.8263062989579 +2634309.8378122295 612303.04634258454 1153.9885037741644 +2634278.0986711001 612371.32646214997 1199.6127929688000 +2634419.3122558924 612334.13839574507 1199.7155140795981 +2634536.0111265741 612240.97273672896 1199.9550104369889 +2634659.1790651856 612156.20817153505 1199.9700474522567 +2634773.3691266719 612059.05765475228 1199.7769779912283 +2634879.2009268999 611957.49262816575 1200.4249262975832 +2635014.4813024905 611892.35995064955 1200.3741326118698 +2635151.0925407428 611839.59133365238 1201.0610839773581 +2635296.3256792971 611804.57398333412 1200.5553454563521 +2635434.7755829832 611746.75181141810 1201.0898854844518 +2635576.8221874414 611697.99894957384 1201.0992960679062 +2635706.3942734781 611626.74971326033 1200.6098020315590 +2635830.9465638138 611553.39338472474 1200.3653674060233 +2635980.6925942688 611540.43472488737 1200.1538152816759 +2636116.8282380374 611485.70032534166 1201.3357828322164 +2636253.5169177675 611443.73316465004 1201.0210060881132 +2636402.0735910581 611452.85793871537 1202.7914756606983 +2636547.2657710332 611418.35913059837 1200.5010183341028 +2636689.0986398663 611373.74046487815 1202.7901766453133 +2636837.2356652915 611375.38657742995 1202.4890466165591 +2636983.8452922772 611408.26018143084 1202.7981731509115 +2637066.4683515150 611525.17375608312 1200.6850133875175 +2637215.0621420289 611547.79423181841 1200.2052413168035 +2637358.4867209527 611518.11434224877 1200.2480802434554 +2637486.5036577615 611446.06382863084 1199.7667459880583 +2637562.8027904797 611316.91620259790 1199.1566775407996 +2637632.1135834721 611189.70114644652 1199.9638488580076 +2637742.6528804339 611089.48462016520 1200.0932947011142 +2637863.3351199669 611007.31513671053 1199.9503265546805 +2637954.1469143024 610890.81719308451 1199.6609505064762 +2638081.6887268540 610811.28803772072 1200.3423495921068 +2638218.0158358980 610802.21047711163 1200.9257598414595 +2638362.8746655746 610833.23635845294 1200.6260727668216 +2638500.1061883708 610893.26000320562 1200.4062282752107 +2638607.2846154352 610847.90446146717 1194.4672557964298 +2638694.1897435999 610725.26964098006 1184.6405240465999 +INSIDE_3D 108 +2637359.9613371999 610694.56827128003 1160.5914306641000 +2637442.2270394517 610651.67256905534 1160.3563539984034 +2637471.2033447023 610563.64126380475 1160.3385129043820 +2637527.2223802740 610507.62222823314 1159.4522691108007 +2637606.8461229033 610458.34827127506 1158.7945952374259 +2637684.0105521586 610412.41660460841 1158.4784681367269 +2637777.0671586762 610421.81911649753 1159.4860648456643 +2637806.1546705654 610333.83387454483 1160.0096646571847 +2637779.9080038988 610252.35938665539 1156.3537046891117 +2637776.1520606778 610159.31732805434 1154.8950938101555 +2637753.6613372318 610068.59960686043 1155.6986364911284 +2637699.0074395454 609992.46993794176 1154.4972997890011 +2637617.4057941958 609964.68381431082 1155.1392673071512 +2637644.4055750174 609883.21417572722 1154.6524254886922 +2637594.4374264786 609808.74327127507 1154.5289306640625 +2637509.6348321866 609781.25176623021 1151.8489664455294 +2637433.1347329612 609724.43666700425 1152.5629966992346 +2637387.1913590357 609658.80829307868 1156.6460968550946 +2637313.4091911349 609604.71112517791 1151.7164306640625 +2637229.4260842176 609565.96160460834 1151.5701545065658 +2637160.0792523208 609510.43618636404 1153.5265613306015 +2637124.8726277146 609428.16660460841 1153.2099661921684 +2637066.6003771611 609364.46397787111 1153.3414306640625 +2637063.0746749230 609282.19827563292 1152.5832073353527 +2636991.2143746931 609223.46130873612 1153.1416088212356 +2636924.7899371129 609170.16020448972 1152.9339544783054 +2636837.4754814366 609152.57660460833 1153.4701490693265 +2636742.8776602140 609139.45327127504 1153.8468982221893 +2636657.6483496740 609139.66792549950 1153.6488192001202 +2636577.6770764026 609113.20660460833 1153.7821118814275 +2636493.9509804803 609086.95993794163 1153.8996086736295 +2636420.1308409511 609032.95444166067 1155.3942857353870 +2636330.1776680294 609021.74126873922 1155.6596170642044 +2636296.9713372318 608935.46209743945 1155.7596113051841 +2636290.8311512726 608843.75679056766 1154.8150621699656 +2636319.8074565232 608755.72548531694 1156.0850721294703 +2636303.5330038983 608670.69415304810 1155.0144550359471 +2636320.6269346946 608577.74100714538 1154.2641905487385 +2636335.6838429580 608483.94409888249 1154.0133372777802 +2636396.7346645091 608417.66993794159 1153.7279402928064 +2636461.0130038983 608379.66298542498 1154.0159476108176 +2636429.1097876793 608299.55993794161 1154.4707495303805 +2636508.9921482601 608260.18993794161 1154.1849487764448 +2636585.2222955152 608221.28231299133 1152.8832699100531 +2636656.7593401046 608161.76493794168 1153.0823545253402 +2636713.3766461592 608092.60691353539 1154.6405559131504 +2636658.2740738401 608030.53160460829 1156.4038570718581 +2636598.8080038987 607970.74531396921 1156.9458190153730 +2636579.5009607119 607886.17493794160 1157.4032810537526 +2636541.1343564820 607802.25462385826 1158.1062362060388 +2636516.7978502270 607712.30145093682 1156.8899841097818 +2636437.1530749532 607663.07827127492 1158.3272486919966 +2636354.5527830478 607630.26993794157 1158.5889122699534 +2636264.1630038987 607609.09482719307 1158.7448173305957 +2636326.9762792001 607544.96827127005 1158.9985559288000 +2636264.1630038987 607609.09482719307 1158.7448173305957 +2636354.5527830478 607630.26993794157 1158.5889122699534 +2636437.1530749532 607663.07827127492 1158.3272486919966 +2636516.7978502270 607712.30145093682 1156.8899841097818 +2636541.1343564820 607802.25462385826 1158.1062362060388 +2636579.5009607119 607886.17493794160 1157.4032810537526 +2636598.8080038987 607970.74531396921 1156.9458190153730 +2636658.2740738401 608030.53160460829 1156.4038570718581 +2636713.3766461592 608092.60691353539 1154.6405559131504 +2636656.7593401046 608161.76493794168 1153.0823545253402 +2636585.2222955152 608221.28231299133 1152.8832699100531 +2636508.9921482601 608260.18993794161 1154.1849487764448 +2636429.1097876793 608299.55993794161 1154.4707495303805 +2636461.0130038983 608379.66298542498 1154.0159476108176 +2636396.7346645091 608417.66993794159 1153.7279402928064 +2636335.6838429580 608483.94409888249 1154.0133372777802 +2636320.6269346946 608577.74100714538 1154.2641905487385 +2636303.5330038983 608670.69415304810 1155.0144550359471 +2636319.8074565232 608755.72548531694 1156.0850721294703 +2636290.8311512726 608843.75679056766 1154.8150621699656 +2636296.9713372318 608935.46209743945 1155.7596113051841 +2636330.1776680294 609021.74126873922 1155.6596170642044 +2636420.1308409511 609032.95444166067 1155.3942857353870 +2636493.9509804803 609086.95993794163 1153.8996086736295 +2636577.6770764026 609113.20660460833 1153.7821118814275 +2636657.6483496740 609139.66792549950 1153.6488192001202 +2636742.8776602140 609139.45327127504 1153.8468982221893 +2636837.4754814366 609152.57660460833 1153.4701490693265 +2636924.7899371129 609170.16020448972 1152.9339544783054 +2636991.2143746931 609223.46130873612 1153.1416088212356 +2637063.0746749230 609282.19827563292 1152.5832073353527 +2637066.6003771611 609364.46397787111 1153.3414306640625 +2637124.8726277146 609428.16660460841 1153.2099661921684 +2637160.0792523208 609510.43618636404 1153.5265613306015 +2637229.4260842176 609565.96160460834 1151.5701545065658 +2637313.4091911349 609604.71112517791 1151.7164306640625 +2637387.1913590357 609658.80829307868 1156.6460968550946 +2637433.1347329612 609724.43666700425 1152.5629966992346 +2637509.6348321866 609781.25176623021 1151.8489664455294 +2637594.4374264786 609808.74327127507 1154.5289306640625 +2637644.4055750174 609883.21417572722 1154.6524254886922 +2637617.4057941958 609964.68381431082 1155.1392673071512 +2637699.0074395454 609992.46993794176 1154.4972997890011 +2637753.6613372318 610068.59960686043 1155.6986364911284 +2637776.1520606778 610159.31732805434 1154.8950938101555 +2637779.9080038988 610252.35938665539 1156.3537046891117 +2637806.1546705654 610333.83387454483 1160.0096646571847 +2637777.0671586762 610421.81911649753 1159.4860648456643 +2637684.0105521586 610412.41660460841 1158.4784681367269 +2637606.8461229033 610458.34827127506 1158.7945952374259 +2637527.2223802740 610507.62222823314 1159.4522691108007 +2637471.2033447023 610563.64126380475 1160.3385129043820 +2637442.2270394517 610651.67256905534 1160.3563539984034 +INSIDE_3D 10 +2637025.3163371999 610989.84327128006 1158.3101806641000 +2637083.0590038793 610932.10060462763 1160.4289306635148 +2637136.1618715492 610859.31273695768 1160.3693335770549 +2637217.1035331944 610798.05607531243 1160.7422874444526 +2637280.6118028727 610741.10947230097 1161.0092923168286 +2637359.9613371999 610694.56827128003 1160.5914306641000 +2637280.6118028727 610741.10947230097 1161.0092923168286 +2637217.1035331944 610798.05607531243 1160.7422874444526 +2637136.1618715492 610859.31273695768 1160.3693335770549 +2637083.0590038793 610932.10060462763 1160.4289306635148 +INSIDE_3D 12 +2637425.5780039001 611150.74907314999 1170.7084002187000 +2637450.9545652885 611062.89170988498 1168.3421141240344 +2637478.0713372319 610975.75516543223 1166.1980517109978 +2637484.1908755219 610891.41827127512 1163.9513565707548 +2637470.4407997858 610811.60940049554 1162.3180989968830 +2637419.4428356793 610760.61143638915 1161.6933054757362 +2637359.9613371999 610694.56827128003 1160.5914306641000 +2637419.4428356793 610760.61143638915 1161.6933054757362 +2637470.4407997858 610811.60940049554 1162.3180989968830 +2637484.1908755219 610891.41827127512 1163.9513565707548 +2637478.0713372319 610975.75516543223 1166.1980517109978 +2637450.9545652885 611062.89170988498 1168.3421141240344 +INSIDE_3D 26 +2635995.1346705998 610163.07327128004 1168.5914306641000 +2635975.4496705653 610252.83524610626 1167.1563842247690 +2635968.8880038983 610348.03308358218 1166.8120663247707 +2635955.7646705653 610440.51298973337 1165.5201213622863 +2635949.2030038983 610535.71082720929 1164.5057912069628 +2635929.5180038987 610625.47280203551 1165.0454984944517 +2635916.3946705651 610717.95270818647 1165.5289306640625 +2635903.2713372316 610810.43261433730 1166.2912954019562 +2635883.5863372320 610900.19458916353 1167.2269779616008 +2635877.0246705650 610995.39242663945 1168.1203632323932 +2635857.3396705650 611085.15440146532 1171.2429096718358 +2635850.7780038984 611180.35223894147 1174.2862860758505 +2635841.7024747073 611274.50880046608 1176.9509951469447 +2635811.4080039002 611354.44032594003 1184.6020909575000 +2635841.7024747073 611274.50880046608 1176.9509951469447 +2635850.7780038984 611180.35223894147 1174.2862860758505 +2635857.3396705650 611085.15440146532 1171.2429096718358 +2635877.0246705650 610995.39242663945 1168.1203632323932 +2635883.5863372320 610900.19458916353 1167.2269779616008 +2635903.2713372316 610810.43261433730 1166.2912954019562 +2635916.3946705651 610717.95270818647 1165.5289306640625 +2635929.5180038987 610625.47280203551 1165.0454984944517 +2635949.2030038983 610535.71082720929 1164.5057912069628 +2635955.7646705653 610440.51298973337 1165.5201213622863 +2635968.8880038983 610348.03308358218 1166.8120663247707 +2635975.4496705653 610252.83524610626 1167.1563842247690 +BIAS 0.2 +CONST_SIZE_FUNCTION 300.0 0.2 +END_POLYGON +RETURN_CELL_POLYGONS diff --git a/test_files/meshing/bug15246_base.2dm b/test_files/meshing/bug15246_base.2dm new file mode 100644 index 00000000..326be349 --- /dev/null +++ b/test_files/meshing/bug15246_base.2dm @@ -0,0 +1,2086 @@ +MESH2D +E3T 1 1 148 2 1 +E3T 2 2 147 3 1 +E3T 3 2 148 147 1 +E3T 4 3 147 427 1 +E3T 5 3 427 4 1 +E3T 6 4 427 428 1 +E3T 7 4 428 5 1 +E3T 8 5 428 429 1 +E3T 9 5 429 6 1 +E3T 10 6 429 430 1 +E3T 11 6 430 7 1 +E3T 12 7 430 431 1 +E3T 13 7 431 8 1 +E3T 14 8 431 432 1 +E3T 15 8 432 9 1 +E3T 16 9 432 433 1 +E3T 17 9 433 10 1 +E3T 18 10 433 434 1 +E3T 19 10 434 11 1 +E3T 20 11 434 435 1 +E3T 21 11 435 12 1 +E3T 22 12 435 436 1 +E3T 23 12 436 13 1 +E3T 24 13 436 462 1 +E3T 25 13 437 14 1 +E3T 26 13 462 437 1 +E3T 27 14 437 438 1 +E3T 28 14 438 15 1 +E3T 29 15 438 439 1 +E3T 30 15 439 16 1 +E3T 31 16 439 440 1 +E3T 32 16 440 17 1 +E3T 33 17 440 441 1 +E3T 34 17 441 18 1 +E3T 35 18 441 19 1 +E3T 36 19 441 442 1 +E3T 37 19 442 443 1 +E3T 38 19 443 20 1 +E3T 39 20 443 444 1 +E3T 40 20 444 21 1 +E3T 41 21 444 445 1 +E3T 42 21 445 22 1 +E3T 43 22 445 446 1 +E3T 44 22 446 23 1 +E3T 45 23 446 24 1 +E3T 46 24 446 447 1 +E3T 47 24 447 25 1 +E3T 48 25 447 448 1 +E3T 49 25 448 26 1 +E3T 50 26 332 27 1 +E3T 51 26 448 332 1 +E3T 52 27 332 333 1 +E3T 53 27 333 334 1 +E3T 54 27 334 28 1 +E3T 55 28 334 335 1 +E3T 56 28 335 29 1 +E3T 57 29 335 336 1 +E3T 58 29 336 30 1 +E3T 59 30 336 337 1 +E3T 60 30 337 31 1 +E3T 61 31 337 338 1 +E3T 62 31 338 32 1 +E3T 63 32 338 339 1 +E3T 64 32 339 340 1 +E3T 65 32 340 33 1 +E3T 66 33 340 341 1 +E3T 67 33 341 34 1 +E3T 68 34 341 35 1 +E3T 69 35 341 36 1 +E3T 70 36 341 37 1 +E3T 71 37 341 342 1 +E3T 72 37 342 38 1 +E3T 73 38 342 39 1 +E3T 74 39 342 343 1 +E3T 75 39 343 40 1 +E3T 76 40 343 344 1 +E3T 77 40 344 345 1 +E3T 78 40 345 41 1 +E3T 79 41 345 42 1 +E3T 80 42 345 43 1 +E3T 81 43 345 44 1 +E3T 82 44 345 346 1 +E3T 83 44 346 45 1 +E3T 84 45 346 347 1 +E3T 85 45 347 348 1 +E3T 86 45 348 46 1 +E3T 87 46 348 349 1 +E3T 88 46 349 47 1 +E3T 89 47 349 48 1 +E3T 90 48 349 350 1 +E3T 91 48 350 49 1 +E3T 92 49 350 351 1 +E3T 93 49 351 50 1 +E3T 94 50 351 352 1 +E3T 95 50 352 51 1 +E3T 96 51 352 52 1 +E3T 97 52 352 53 1 +E3T 98 53 352 353 1 +E3T 99 53 353 54 1 +E3T 100 54 353 354 1 +E3T 101 54 354 55 1 +E3T 102 55 354 355 1 +E3T 103 55 355 56 1 +E3T 104 56 355 356 1 +E3T 105 56 356 57 1 +E3T 106 57 356 357 1 +E3T 107 57 357 58 1 +E3T 108 58 357 358 1 +E3T 109 58 358 59 1 +E3T 110 59 358 60 1 +E3T 111 60 358 359 1 +E3T 112 60 359 61 1 +E3T 113 61 359 360 1 +E3T 114 61 360 62 1 +E3T 115 62 360 361 1 +E3T 116 62 361 63 1 +E3T 117 63 361 362 1 +E3T 118 63 362 64 1 +E3T 119 64 362 363 1 +E3T 120 64 363 65 1 +E3T 121 65 363 66 1 +E3T 122 66 363 364 1 +E3T 123 66 364 67 1 +E3T 124 67 364 365 1 +E3T 125 67 365 68 1 +E3T 126 68 365 366 1 +E3T 127 68 366 69 1 +E3T 128 69 366 367 1 +E3T 129 69 367 70 1 +E3T 130 70 367 368 1 +E3T 131 70 368 71 1 +E3T 132 71 368 72 1 +E3T 133 72 368 369 1 +E3T 134 72 369 73 1 +E3T 135 73 369 370 1 +E3T 136 73 370 74 1 +E3T 137 74 370 371 1 +E3T 138 74 371 75 1 +E3T 139 75 371 372 1 +E3T 140 75 372 76 1 +E3T 141 76 372 77 1 +E3T 142 77 372 373 1 +E3T 143 77 373 78 1 +E3T 144 78 373 374 1 +E3T 145 78 374 79 1 +E3T 146 79 374 375 1 +E3T 147 79 375 80 1 +E3T 148 80 375 376 1 +E3T 149 80 376 81 1 +E3T 150 81 83 82 1 +E3T 151 81 376 83 1 +E3T 152 83 376 377 1 +E3T 153 83 377 84 1 +E3T 154 84 377 378 1 +E3T 155 84 378 379 1 +E3T 156 84 379 85 1 +E3T 157 85 379 380 1 +E3T 158 85 380 86 1 +E3T 159 86 380 87 1 +E3T 160 87 380 381 1 +E3T 161 87 381 88 1 +E3T 162 88 381 382 1 +E3T 163 88 382 89 1 +E3T 164 89 382 90 1 +E3T 165 90 382 383 1 +E3T 166 90 383 91 1 +E3T 167 91 383 384 1 +E3T 168 91 384 92 1 +E3T 169 92 384 93 1 +E3T 170 93 384 385 1 +E3T 171 93 385 94 1 +E3T 172 94 385 95 1 +E3T 173 95 385 386 1 +E3T 174 95 386 96 1 +E3T 175 96 386 387 1 +E3T 176 96 387 97 1 +E3T 177 97 387 388 1 +E3T 178 97 388 98 1 +E3T 179 98 388 389 1 +E3T 180 98 389 99 1 +E3T 181 99 389 100 1 +E3T 182 100 389 390 1 +E3T 183 100 390 101 1 +E3T 184 101 390 391 1 +E3T 185 101 391 102 1 +E3T 186 102 391 392 1 +E3T 187 102 392 103 1 +E3T 188 103 392 104 1 +E3T 189 104 392 393 1 +E3T 190 104 393 105 1 +E3T 191 105 393 394 1 +E3T 192 105 394 106 1 +E3T 193 106 394 395 1 +E3T 194 106 395 107 1 +E3T 195 107 395 396 1 +E3T 196 107 396 108 1 +E3T 197 108 396 109 1 +E3T 198 109 396 397 1 +E3T 199 109 397 110 1 +E3T 200 110 397 398 1 +E3T 201 110 398 111 1 +E3T 202 111 398 399 1 +E3T 203 111 399 112 1 +E3T 204 112 399 113 1 +E3T 205 113 399 400 1 +E3T 206 113 400 114 1 +E3T 207 114 400 401 1 +E3T 208 114 401 115 1 +E3T 209 115 401 402 1 +E3T 210 115 402 116 1 +E3T 211 116 402 403 1 +E3T 212 116 403 117 1 +E3T 213 117 403 404 1 +E3T 214 117 404 118 1 +E3T 215 118 404 405 1 +E3T 216 118 405 119 1 +E3T 217 119 405 120 1 +E3T 218 120 405 406 1 +E3T 219 120 406 121 1 +E3T 220 121 406 407 1 +E3T 221 121 407 122 1 +E3T 222 122 407 408 1 +E3T 223 122 408 123 1 +E3T 224 123 408 409 1 +E3T 225 123 409 124 1 +E3T 226 124 409 410 1 +E3T 227 124 410 125 1 +E3T 228 125 410 126 1 +E3T 229 126 410 411 1 +E3T 230 126 411 127 1 +E3T 231 127 411 412 1 +E3T 232 127 412 128 1 +E3T 233 128 412 413 1 +E3T 234 128 413 129 1 +E3T 235 129 413 414 1 +E3T 236 129 414 130 1 +E3T 237 130 414 415 1 +E3T 238 130 415 131 1 +E3T 239 131 415 416 1 +E3T 240 131 416 132 1 +E3T 241 132 416 133 1 +E3T 242 133 416 417 1 +E3T 243 133 417 134 1 +E3T 244 134 417 418 1 +E3T 245 134 418 135 1 +E3T 246 135 418 419 1 +E3T 247 135 419 136 1 +E3T 248 136 419 420 1 +E3T 249 136 420 137 1 +E3T 250 137 420 138 1 +E3T 251 138 420 421 1 +E3T 252 138 421 139 1 +E3T 253 139 421 422 1 +E3T 254 139 422 140 1 +E3T 255 140 422 423 1 +E3T 256 140 423 141 1 +E3T 257 141 423 424 1 +E3T 258 141 424 142 1 +E3T 259 142 424 143 1 +E3T 260 143 424 425 1 +E3T 261 143 425 144 1 +E3T 262 144 425 145 1 +E3T 263 145 425 426 1 +E3T 264 145 426 146 1 +E3T 265 146 426 147 1 +E3T 266 147 426 427 1 +E3T 267 149 150 214 1 +E3T 268 149 208 243 1 +E3T 269 149 214 234 1 +E3T 270 149 234 208 1 +E3T 271 149 243 244 1 +E3T 272 149 244 150 1 +E3T 273 150 151 327 1 +E3T 274 150 244 151 1 +E3T 275 150 327 328 1 +E3T 276 150 328 214 1 +E3T 277 151 152 326 1 +E3T 278 151 244 245 1 +E3T 279 151 245 152 1 +E3T 280 151 326 327 1 +E3T 281 152 153 326 1 +E3T 282 152 245 246 1 +E3T 283 152 246 153 1 +E3T 284 153 154 325 1 +E3T 285 153 246 247 1 +E3T 286 153 247 154 1 +E3T 287 153 325 326 1 +E3T 288 154 155 325 1 +E3T 289 154 247 248 1 +E3T 290 154 248 155 1 +E3T 291 155 156 323 1 +E3T 292 155 248 156 1 +E3T 293 155 323 324 1 +E3T 294 155 324 325 1 +E3T 295 156 157 322 1 +E3T 296 156 248 157 1 +E3T 297 156 322 323 1 +E3T 298 157 158 321 1 +E3T 299 157 248 249 1 +E3T 300 157 249 158 1 +E3T 301 157 321 322 1 +E3T 302 158 159 320 1 +E3T 303 158 249 250 1 +E3T 304 158 250 159 1 +E3T 305 158 320 321 1 +E3T 306 159 160 319 1 +E3T 307 159 250 160 1 +E3T 308 159 319 320 1 +E3T 309 160 161 162 1 +E3T 310 160 162 318 1 +E3T 311 160 250 251 1 +E3T 312 160 251 161 1 +E3T 313 160 318 319 1 +E3T 314 161 251 252 1 +E3T 315 161 252 162 1 +E3T 316 162 163 317 1 +E3T 317 162 252 163 1 +E3T 318 162 317 318 1 +E3T 319 163 164 316 1 +E3T 320 163 252 253 1 +E3T 321 163 253 164 1 +E3T 322 163 316 317 1 +E3T 323 164 165 315 1 +E3T 324 164 253 254 1 +E3T 325 164 254 165 1 +E3T 326 164 315 316 1 +E3T 327 165 166 315 1 +E3T 328 165 254 255 1 +E3T 329 165 255 166 1 +E3T 330 166 167 314 1 +E3T 331 166 255 167 1 +E3T 332 166 314 315 1 +E3T 333 167 168 313 1 +E3T 334 167 255 256 1 +E3T 335 167 256 168 1 +E3T 336 167 313 314 1 +E3T 337 168 169 312 1 +E3T 338 168 256 257 1 +E3T 339 168 257 169 1 +E3T 340 168 312 313 1 +E3T 341 169 170 312 1 +E3T 342 169 257 258 1 +E3T 343 169 258 170 1 +E3T 344 170 171 311 1 +E3T 345 170 258 259 1 +E3T 346 170 259 171 1 +E3T 347 170 311 312 1 +E3T 348 171 172 310 1 +E3T 349 171 259 260 1 +E3T 350 171 260 172 1 +E3T 351 171 310 311 1 +E3T 352 172 173 309 1 +E3T 353 172 260 173 1 +E3T 354 172 309 310 1 +E3T 355 173 174 308 1 +E3T 356 173 260 261 1 +E3T 357 173 261 174 1 +E3T 358 173 308 309 1 +E3T 359 174 175 307 1 +E3T 360 174 261 175 1 +E3T 361 174 307 308 1 +E3T 362 175 176 306 1 +E3T 363 175 261 262 1 +E3T 364 175 262 176 1 +E3T 365 175 306 307 1 +E3T 366 176 177 305 1 +E3T 367 176 262 263 1 +E3T 368 176 263 177 1 +E3T 369 176 305 306 1 +E3T 370 177 178 305 1 +E3T 371 177 263 264 1 +E3T 372 177 264 178 1 +E3T 373 178 179 304 1 +E3T 374 178 264 179 1 +E3T 375 178 304 305 1 +E3T 376 179 180 303 1 +E3T 377 179 264 265 1 +E3T 378 179 265 180 1 +E3T 379 179 303 304 1 +E3T 380 180 181 302 1 +E3T 381 180 265 266 1 +E3T 382 180 266 181 1 +E3T 383 180 302 303 1 +E3T 384 181 182 302 1 +E3T 385 181 266 267 1 +E3T 386 181 267 182 1 +E3T 387 182 183 302 1 +E3T 388 182 267 268 1 +E3T 389 182 268 183 1 +E3T 390 183 184 301 1 +E3T 391 183 268 269 1 +E3T 392 183 269 184 1 +E3T 393 183 301 302 1 +E3T 394 184 185 300 1 +E3T 395 184 269 270 1 +E3T 396 184 270 185 1 +E3T 397 184 300 301 1 +E3T 398 185 186 300 1 +E3T 399 185 270 271 1 +E3T 400 185 271 186 1 +E3T 401 186 187 299 1 +E3T 402 186 271 272 1 +E3T 403 186 272 187 1 +E3T 404 186 299 300 1 +E3T 405 187 188 298 1 +E3T 406 187 272 273 1 +E3T 407 187 273 188 1 +E3T 408 187 298 299 1 +E3T 409 188 189 298 1 +E3T 410 188 273 274 1 +E3T 411 188 274 189 1 +E3T 412 189 190 191 1 +E3T 413 189 191 296 1 +E3T 414 189 274 190 1 +E3T 415 189 296 297 1 +E3T 416 189 297 298 1 +E3T 417 190 274 275 1 +E3T 418 190 275 191 1 +E3T 419 191 192 296 1 +E3T 420 191 275 276 1 +E3T 421 191 276 192 1 +E3T 422 192 193 295 1 +E3T 423 192 276 277 1 +E3T 424 192 277 193 1 +E3T 425 192 295 296 1 +E3T 426 193 194 294 1 +E3T 427 193 277 194 1 +E3T 428 193 294 295 1 +E3T 429 194 195 292 1 +E3T 430 194 277 195 1 +E3T 431 194 292 293 1 +E3T 432 194 293 294 1 +E3T 433 195 196 291 1 +E3T 434 195 277 278 1 +E3T 435 195 278 196 1 +E3T 436 195 291 292 1 +E3T 437 196 197 291 1 +E3T 438 196 278 279 1 +E3T 439 196 279 197 1 +E3T 440 197 198 290 1 +E3T 441 197 279 280 1 +E3T 442 197 280 198 1 +E3T 443 197 290 291 1 +E3T 444 198 199 289 1 +E3T 445 198 280 199 1 +E3T 446 198 289 290 1 +E3T 447 199 200 288 1 +E3T 448 199 280 281 1 +E3T 449 199 281 200 1 +E3T 450 199 288 289 1 +E3T 451 200 201 287 1 +E3T 452 200 281 201 1 +E3T 453 200 287 288 1 +E3T 454 201 202 203 1 +E3T 455 201 203 287 1 +E3T 456 201 281 282 1 +E3T 457 201 282 202 1 +E3T 458 202 282 283 1 +E3T 459 202 283 284 1 +E3T 460 202 284 203 1 +E3T 461 203 284 285 1 +E3T 462 203 285 286 1 +E3T 463 203 286 287 1 +E3T 464 204 205 236 1 +E3T 465 204 236 237 1 +E3T 466 204 237 238 1 +E3T 467 204 238 239 1 +E3T 468 204 239 205 1 +E3T 469 205 206 236 1 +E3T 470 205 239 240 1 +E3T 471 205 240 206 1 +E3T 472 206 207 235 1 +E3T 473 206 235 236 1 +E3T 474 206 240 241 1 +E3T 475 206 241 207 1 +E3T 476 207 208 234 1 +E3T 477 207 234 235 1 +E3T 478 207 241 242 1 +E3T 479 207 242 208 1 +E3T 480 208 242 243 1 +E3T 481 209 210 333 1 +E3T 482 209 229 230 1 +E3T 483 209 230 231 1 +E3T 484 209 231 210 1 +E3T 485 209 332 229 1 +E3T 486 209 333 332 1 +E3T 487 210 211 331 1 +E3T 488 210 231 211 1 +E3T 489 210 331 333 1 +E3T 490 211 212 330 1 +E3T 491 211 231 232 1 +E3T 492 211 232 212 1 +E3T 493 211 330 331 1 +E3T 494 212 213 329 1 +E3T 495 212 232 233 1 +E3T 496 212 233 213 1 +E3T 497 212 329 330 1 +E3T 498 213 214 328 1 +E3T 499 213 233 214 1 +E3T 500 213 328 329 1 +E3T 501 214 233 234 1 +E3T 502 215 216 474 1 +E3T 503 215 449 450 1 +E3T 504 215 450 451 1 +E3T 505 215 451 452 1 +E3T 506 215 452 216 1 +E3T 507 215 474 449 1 +E3T 508 216 217 473 1 +E3T 509 216 452 217 1 +E3T 510 216 473 474 1 +E3T 511 217 218 473 1 +E3T 512 217 452 453 1 +E3T 513 217 453 218 1 +E3T 514 218 219 472 1 +E3T 515 218 453 454 1 +E3T 516 218 454 219 1 +E3T 517 218 472 473 1 +E3T 518 219 220 471 1 +E3T 519 219 454 455 1 +E3T 520 219 455 220 1 +E3T 521 219 471 472 1 +E3T 522 220 221 470 1 +E3T 523 220 455 456 1 +E3T 524 220 456 221 1 +E3T 525 220 470 471 1 +E3T 526 221 222 469 1 +E3T 527 221 456 457 1 +E3T 528 221 457 222 1 +E3T 529 221 469 470 1 +E3T 530 222 223 469 1 +E3T 531 222 457 223 1 +E3T 532 223 224 468 1 +E3T 533 223 457 458 1 +E3T 534 223 458 224 1 +E3T 535 223 468 469 1 +E3T 536 224 225 467 1 +E3T 537 224 458 459 1 +E3T 538 224 459 225 1 +E3T 539 224 467 468 1 +E3T 540 225 226 466 1 +E3T 541 225 459 460 1 +E3T 542 225 460 226 1 +E3T 543 225 466 467 1 +E3T 544 226 227 465 1 +E3T 545 226 460 227 1 +E3T 546 226 465 466 1 +E3T 547 227 228 465 1 +E3T 548 227 460 461 1 +E3T 549 227 461 228 1 +E3T 550 228 461 462 1 +E3T 551 228 462 463 1 +E3T 552 228 463 464 1 +E3T 553 228 464 465 1 +E3T 554 229 332 448 1 +E3T 555 229 447 536 1 +E3T 556 229 448 447 1 +E3T 557 229 536 230 1 +E3T 558 230 536 537 1 +E3T 559 230 537 231 1 +E3T 560 231 537 538 1 +E3T 561 231 538 232 1 +E3T 562 232 234 233 1 +E3T 563 232 235 234 1 +E3T 564 232 538 235 1 +E3T 565 235 538 236 1 +E3T 566 236 538 539 1 +E3T 567 236 539 237 1 +E3T 568 237 534 540 1 +E3T 569 237 539 534 1 +E3T 570 237 540 238 1 +E3T 571 238 533 541 1 +E3T 572 238 540 533 1 +E3T 573 238 541 239 1 +E3T 574 239 541 542 1 +E3T 575 239 542 240 1 +E3T 576 240 542 543 1 +E3T 577 240 543 241 1 +E3T 578 241 543 544 1 +E3T 579 241 544 242 1 +E3T 580 242 544 545 1 +E3T 581 242 545 243 1 +E3T 582 243 545 244 1 +E3T 583 244 545 546 1 +E3T 584 244 546 245 1 +E3T 585 245 546 547 1 +E3T 586 245 547 246 1 +E3T 587 246 547 548 1 +E3T 588 246 548 247 1 +E3T 589 247 249 248 1 +E3T 590 247 548 249 1 +E3T 591 249 548 549 1 +E3T 592 249 549 250 1 +E3T 593 250 549 251 1 +E3T 594 251 549 550 1 +E3T 595 251 550 252 1 +E3T 596 252 550 551 1 +E3T 597 252 551 253 1 +E3T 598 253 551 254 1 +E3T 599 254 551 552 1 +E3T 600 254 552 255 1 +E3T 601 255 552 553 1 +E3T 602 255 553 256 1 +E3T 603 256 553 554 1 +E3T 604 256 554 257 1 +E3T 605 257 554 555 1 +E3T 606 257 555 258 1 +E3T 607 258 555 556 1 +E3T 608 258 556 259 1 +E3T 609 259 556 260 1 +E3T 610 260 556 557 1 +E3T 611 260 557 261 1 +E3T 612 261 557 262 1 +E3T 613 262 557 558 1 +E3T 614 262 558 263 1 +E3T 615 263 558 559 1 +E3T 616 263 559 264 1 +E3T 617 264 559 560 1 +E3T 618 264 560 265 1 +E3T 619 265 560 561 1 +E3T 620 265 561 266 1 +E3T 621 266 561 562 1 +E3T 622 266 562 267 1 +E3T 623 267 562 563 1 +E3T 624 267 563 268 1 +E3T 625 268 563 564 1 +E3T 626 268 564 269 1 +E3T 627 269 564 565 1 +E3T 628 269 565 270 1 +E3T 629 270 565 271 1 +E3T 630 271 565 566 1 +E3T 631 271 566 272 1 +E3T 632 272 566 567 1 +E3T 633 272 567 273 1 +E3T 634 273 567 568 1 +E3T 635 273 568 274 1 +E3T 636 274 568 569 1 +E3T 637 274 569 275 1 +E3T 638 275 569 570 1 +E3T 639 275 570 276 1 +E3T 640 276 278 277 1 +E3T 641 276 570 278 1 +E3T 642 278 570 571 1 +E3T 643 278 571 279 1 +E3T 644 279 571 572 1 +E3T 645 279 572 280 1 +E3T 646 280 572 281 1 +E3T 647 281 572 573 1 +E3T 648 281 573 282 1 +E3T 649 282 573 574 1 +E3T 650 282 574 283 1 +E3T 651 283 574 575 1 +E3T 652 283 575 284 1 +E3T 653 284 575 576 1 +E3T 654 284 576 285 1 +E3T 655 285 379 286 1 +E3T 656 285 380 379 1 +E3T 657 285 576 380 1 +E3T 658 286 378 287 1 +E3T 659 286 379 378 1 +E3T 660 287 377 288 1 +E3T 661 287 378 377 1 +E3T 662 288 375 289 1 +E3T 663 288 376 375 1 +E3T 664 288 377 376 1 +E3T 665 289 374 290 1 +E3T 666 289 375 374 1 +E3T 667 290 373 291 1 +E3T 668 290 374 373 1 +E3T 669 291 373 292 1 +E3T 670 292 372 293 1 +E3T 671 292 373 372 1 +E3T 672 293 370 294 1 +E3T 673 293 371 370 1 +E3T 674 293 372 371 1 +E3T 675 294 370 475 1 +E3T 676 294 475 295 1 +E3T 677 295 475 476 1 +E3T 678 295 476 296 1 +E3T 679 296 476 297 1 +E3T 680 297 476 477 1 +E3T 681 297 477 298 1 +E3T 682 298 477 478 1 +E3T 683 298 478 299 1 +E3T 684 299 478 300 1 +E3T 685 300 478 479 1 +E3T 686 300 479 301 1 +E3T 687 301 479 480 1 +E3T 688 301 480 302 1 +E3T 689 302 480 303 1 +E3T 690 303 480 481 1 +E3T 691 303 481 304 1 +E3T 692 304 481 305 1 +E3T 693 305 481 482 1 +E3T 694 305 482 306 1 +E3T 695 306 482 483 1 +E3T 696 306 483 307 1 +E3T 697 307 483 484 1 +E3T 698 307 484 308 1 +E3T 699 308 484 485 1 +E3T 700 308 485 309 1 +E3T 701 309 485 486 1 +E3T 702 309 486 310 1 +E3T 703 310 486 487 1 +E3T 704 310 487 311 1 +E3T 705 311 487 312 1 +E3T 706 312 487 488 1 +E3T 707 312 488 313 1 +E3T 708 313 488 489 1 +E3T 709 313 489 314 1 +E3T 710 314 489 315 1 +E3T 711 315 489 490 1 +E3T 712 315 490 316 1 +E3T 713 316 490 491 1 +E3T 714 316 491 317 1 +E3T 715 317 491 492 1 +E3T 716 317 492 318 1 +E3T 717 318 492 493 1 +E3T 718 318 493 319 1 +E3T 719 319 493 320 1 +E3T 720 320 493 494 1 +E3T 721 320 494 321 1 +E3T 722 321 494 495 1 +E3T 723 321 495 322 1 +E3T 724 322 495 496 1 +E3T 725 322 496 323 1 +E3T 726 323 496 497 1 +E3T 727 323 497 498 1 +E3T 728 323 498 324 1 +E3T 729 324 498 499 1 +E3T 730 324 499 325 1 +E3T 731 325 499 326 1 +E3T 732 326 499 500 1 +E3T 733 326 500 327 1 +E3T 734 327 500 328 1 +E3T 735 328 500 329 1 +E3T 736 329 500 501 1 +E3T 737 329 501 330 1 +E3T 738 330 334 331 1 +E3T 739 330 501 334 1 +E3T 740 331 334 333 1 +E3T 741 334 501 335 1 +E3T 742 335 501 502 1 +E3T 743 335 502 336 1 +E3T 744 336 502 503 1 +E3T 745 336 503 337 1 +E3T 746 337 503 504 1 +E3T 747 337 504 338 1 +E3T 748 338 504 505 1 +E3T 749 338 505 339 1 +E3T 750 339 505 506 1 +E3T 751 339 506 340 1 +E3T 752 340 342 341 1 +E3T 753 340 506 342 1 +E3T 754 342 506 343 1 +E3T 755 343 506 507 1 +E3T 756 343 507 508 1 +E3T 757 343 508 344 1 +E3T 758 344 508 345 1 +E3T 759 345 508 346 1 +E3T 760 346 508 509 1 +E3T 761 346 509 347 1 +E3T 762 347 509 510 1 +E3T 763 347 510 348 1 +E3T 764 348 510 511 1 +E3T 765 348 511 349 1 +E3T 766 349 511 512 1 +E3T 767 349 512 350 1 +E3T 768 350 512 513 1 +E3T 769 350 513 351 1 +E3T 770 351 513 352 1 +E3T 771 352 513 514 1 +E3T 772 352 514 353 1 +E3T 773 353 514 515 1 +E3T 774 353 515 354 1 +E3T 775 354 515 355 1 +E3T 776 355 515 516 1 +E3T 777 355 516 356 1 +E3T 778 356 516 517 1 +E3T 779 356 517 357 1 +E3T 780 357 517 518 1 +E3T 781 357 518 358 1 +E3T 782 358 518 519 1 +E3T 783 358 519 359 1 +E3T 784 359 519 520 1 +E3T 785 359 520 360 1 +E3T 786 360 520 521 1 +E3T 787 360 521 361 1 +E3T 788 361 521 362 1 +E3T 789 362 521 522 1 +E3T 790 362 522 363 1 +E3T 791 363 522 523 1 +E3T 792 363 523 364 1 +E3T 793 364 523 524 1 +E3T 794 364 524 365 1 +E3T 795 365 524 525 1 +E3T 796 365 525 366 1 +E3T 797 366 525 526 1 +E3T 798 366 526 367 1 +E3T 799 367 526 368 1 +E3T 800 368 526 527 1 +E3T 801 368 527 369 1 +E3T 802 369 475 370 1 +E3T 803 369 527 475 1 +E3T 804 380 576 577 1 +E3T 805 380 577 381 1 +E3T 806 381 577 382 1 +E3T 807 382 577 578 1 +E3T 808 382 578 383 1 +E3T 809 383 578 579 1 +E3T 810 383 579 384 1 +E3T 811 384 579 385 1 +E3T 812 385 579 580 1 +E3T 813 385 580 386 1 +E3T 814 386 580 387 1 +E3T 815 387 580 581 1 +E3T 816 387 581 388 1 +E3T 817 388 581 582 1 +E3T 818 388 582 389 1 +E3T 819 389 582 583 1 +E3T 820 389 583 390 1 +E3T 821 390 583 391 1 +E3T 822 391 583 584 1 +E3T 823 391 584 392 1 +E3T 824 392 584 585 1 +E3T 825 392 585 393 1 +E3T 826 393 585 586 1 +E3T 827 393 586 394 1 +E3T 828 394 586 395 1 +E3T 829 395 586 587 1 +E3T 830 395 587 396 1 +E3T 831 396 587 588 1 +E3T 832 396 588 397 1 +E3T 833 397 588 589 1 +E3T 834 397 589 398 1 +E3T 835 398 589 590 1 +E3T 836 398 590 399 1 +E3T 837 399 590 400 1 +E3T 838 400 590 591 1 +E3T 839 400 591 401 1 +E3T 840 401 591 592 1 +E3T 841 401 592 402 1 +E3T 842 402 592 593 1 +E3T 843 402 593 403 1 +E3T 844 403 593 594 1 +E3T 845 403 594 404 1 +E3T 846 404 594 595 1 +E3T 847 404 595 405 1 +E3T 848 405 595 406 1 +E3T 849 406 595 596 1 +E3T 850 406 596 407 1 +E3T 851 407 596 597 1 +E3T 852 407 597 408 1 +E3T 853 408 597 598 1 +E3T 854 408 598 409 1 +E3T 855 409 598 599 1 +E3T 856 409 599 410 1 +E3T 857 410 599 411 1 +E3T 858 411 599 600 1 +E3T 859 411 600 412 1 +E3T 860 412 600 601 1 +E3T 861 412 601 413 1 +E3T 862 413 601 602 1 +E3T 863 413 602 414 1 +E3T 864 414 602 603 1 +E3T 865 414 603 415 1 +E3T 866 415 603 604 1 +E3T 867 415 604 416 1 +E3T 868 416 604 605 1 +E3T 869 416 605 417 1 +E3T 870 417 605 418 1 +E3T 871 418 605 606 1 +E3T 872 418 606 419 1 +E3T 873 419 606 607 1 +E3T 874 419 607 420 1 +E3T 875 420 607 608 1 +E3T 876 420 608 421 1 +E3T 877 421 608 422 1 +E3T 878 422 429 423 1 +E3T 879 422 430 429 1 +E3T 880 422 608 430 1 +E3T 881 423 429 424 1 +E3T 882 424 428 425 1 +E3T 883 424 429 428 1 +E3T 884 425 427 426 1 +E3T 885 425 428 427 1 +E3T 886 430 608 431 1 +E3T 887 431 608 609 1 +E3T 888 431 609 432 1 +E3T 889 432 609 610 1 +E3T 890 432 610 433 1 +E3T 891 433 610 611 1 +E3T 892 433 611 434 1 +E3T 893 434 611 612 1 +E3T 894 434 612 435 1 +E3T 895 435 464 436 1 +E3T 896 435 612 464 1 +E3T 897 436 463 462 1 +E3T 898 436 464 463 1 +E3T 899 437 461 438 1 +E3T 900 437 462 461 1 +E3T 901 438 461 528 1 +E3T 902 438 528 439 1 +E3T 903 439 528 529 1 +E3T 904 439 529 440 1 +E3T 905 440 529 530 1 +E3T 906 440 530 441 1 +E3T 907 441 530 531 1 +E3T 908 441 531 442 1 +E3T 909 442 531 532 1 +E3T 910 442 532 443 1 +E3T 911 443 532 533 1 +E3T 912 443 533 444 1 +E3T 913 444 533 540 1 +E3T 914 444 534 445 1 +E3T 915 444 540 534 1 +E3T 916 445 534 535 1 +E3T 917 445 535 446 1 +E3T 918 446 535 536 1 +E3T 919 446 536 447 1 +E3T 920 449 474 621 1 +E3T 921 449 621 622 1 +E3T 922 449 622 450 1 +E3T 923 450 622 694 1 +E3T 924 450 623 451 1 +E3T 925 450 694 623 1 +E3T 926 451 623 624 1 +E3T 927 451 624 452 1 +E3T 928 452 624 625 1 +E3T 929 452 625 453 1 +E3T 930 453 625 626 1 +E3T 931 453 626 454 1 +E3T 932 454 626 455 1 +E3T 933 455 626 627 1 +E3T 934 455 627 456 1 +E3T 935 456 627 628 1 +E3T 936 456 628 457 1 +E3T 937 457 628 629 1 +E3T 938 457 629 458 1 +E3T 939 458 629 630 1 +E3T 940 458 630 459 1 +E3T 941 459 630 460 1 +E3T 942 460 528 461 1 +E3T 943 460 630 528 1 +E3T 944 464 612 613 1 +E3T 945 464 613 465 1 +E3T 946 465 613 614 1 +E3T 947 465 614 466 1 +E3T 948 466 614 615 1 +E3T 949 466 615 467 1 +E3T 950 467 615 468 1 +E3T 951 468 615 616 1 +E3T 952 468 616 469 1 +E3T 953 469 616 617 1 +E3T 954 469 617 470 1 +E3T 955 470 617 618 1 +E3T 956 470 618 471 1 +E3T 957 471 618 472 1 +E3T 958 472 618 619 1 +E3T 959 472 619 473 1 +E3T 960 473 619 620 1 +E3T 961 473 620 474 1 +E3T 962 474 620 621 1 +E3T 963 475 527 476 1 +E3T 964 476 527 633 1 +E3T 965 476 633 477 1 +E3T 966 477 633 634 1 +E3T 967 477 634 478 1 +E3T 968 478 634 479 1 +E3T 969 479 634 635 1 +E3T 970 479 635 480 1 +E3T 971 480 635 481 1 +E3T 972 481 635 636 1 +E3T 973 481 636 482 1 +E3T 974 482 636 483 1 +E3T 975 483 631 484 1 +E3T 976 483 636 631 1 +E3T 977 484 522 485 1 +E3T 978 484 523 522 1 +E3T 979 484 631 523 1 +E3T 980 485 521 486 1 +E3T 981 485 522 521 1 +E3T 982 486 520 487 1 +E3T 983 486 521 520 1 +E3T 984 487 519 488 1 +E3T 985 487 520 519 1 +E3T 986 488 519 489 1 +E3T 987 489 518 490 1 +E3T 988 489 519 518 1 +E3T 989 490 517 491 1 +E3T 990 490 518 517 1 +E3T 991 491 516 492 1 +E3T 992 491 517 516 1 +E3T 993 492 515 493 1 +E3T 994 492 516 515 1 +E3T 995 493 512 494 1 +E3T 996 493 513 512 1 +E3T 997 493 514 513 1 +E3T 998 493 515 514 1 +E3T 999 494 511 495 1 +E3T 1000 494 512 511 1 +E3T 1001 495 510 496 1 +E3T 1002 495 511 510 1 +E3T 1003 496 509 497 1 +E3T 1004 496 510 509 1 +E3T 1005 497 504 498 1 +E3T 1006 497 505 504 1 +E3T 1007 497 509 505 1 +E3T 1008 498 503 499 1 +E3T 1009 498 504 503 1 +E3T 1010 499 502 500 1 +E3T 1011 499 503 502 1 +E3T 1012 500 502 501 1 +E3T 1013 505 507 506 1 +E3T 1014 505 509 507 1 +E3T 1015 507 509 508 1 +E3T 1016 523 631 524 1 +E3T 1017 524 631 632 1 +E3T 1018 524 632 525 1 +E3T 1019 525 632 526 1 +E3T 1020 526 632 633 1 +E3T 1021 526 633 527 1 +E3T 1022 528 630 529 1 +E3T 1023 529 630 700 1 +E3T 1024 529 700 530 1 +E3T 1025 530 700 701 1 +E3T 1026 530 701 531 1 +E3T 1027 531 701 702 1 +E3T 1028 531 702 532 1 +E3T 1029 532 644 533 1 +E3T 1030 532 702 644 1 +E3T 1031 533 644 541 1 +E3T 1032 534 539 535 1 +E3T 1033 535 537 536 1 +E3T 1034 535 539 537 1 +E3T 1035 537 539 538 1 +E3T 1036 541 644 542 1 +E3T 1037 542 644 645 1 +E3T 1038 542 645 543 1 +E3T 1039 543 645 646 1 +E3T 1040 543 646 544 1 +E3T 1041 544 646 647 1 +E3T 1042 544 647 545 1 +E3T 1043 545 647 648 1 +E3T 1044 545 648 546 1 +E3T 1045 546 648 649 1 +E3T 1046 546 649 547 1 +E3T 1047 547 649 650 1 +E3T 1048 547 650 548 1 +E3T 1049 548 650 549 1 +E3T 1050 549 650 550 1 +E3T 1051 550 650 651 1 +E3T 1052 550 651 551 1 +E3T 1053 551 651 552 1 +E3T 1054 552 651 652 1 +E3T 1055 552 652 553 1 +E3T 1056 553 652 653 1 +E3T 1057 553 653 554 1 +E3T 1058 554 653 654 1 +E3T 1059 554 654 555 1 +E3T 1060 555 654 655 1 +E3T 1061 555 655 556 1 +E3T 1062 556 655 557 1 +E3T 1063 557 655 656 1 +E3T 1064 557 656 558 1 +E3T 1065 558 656 559 1 +E3T 1066 559 656 657 1 +E3T 1067 559 657 560 1 +E3T 1068 560 657 658 1 +E3T 1069 560 658 561 1 +E3T 1070 561 658 659 1 +E3T 1071 561 659 562 1 +E3T 1072 562 659 660 1 +E3T 1073 562 660 563 1 +E3T 1074 563 660 661 1 +E3T 1075 563 661 564 1 +E3T 1076 564 661 662 1 +E3T 1077 564 662 565 1 +E3T 1078 565 662 663 1 +E3T 1079 565 663 566 1 +E3T 1080 566 663 664 1 +E3T 1081 566 664 567 1 +E3T 1082 567 664 665 1 +E3T 1083 567 665 568 1 +E3T 1084 568 665 569 1 +E3T 1085 569 665 666 1 +E3T 1086 569 666 570 1 +E3T 1087 570 666 667 1 +E3T 1088 570 667 571 1 +E3T 1089 571 667 572 1 +E3T 1090 572 667 668 1 +E3T 1091 572 668 573 1 +E3T 1092 573 668 574 1 +E3T 1093 574 668 669 1 +E3T 1094 574 669 575 1 +E3T 1095 575 669 670 1 +E3T 1096 575 670 576 1 +E3T 1097 576 578 577 1 +E3T 1098 576 670 578 1 +E3T 1099 578 670 671 1 +E3T 1100 578 671 579 1 +E3T 1101 579 671 580 1 +E3T 1102 580 671 672 1 +E3T 1103 580 672 581 1 +E3T 1104 581 672 673 1 +E3T 1105 581 673 582 1 +E3T 1106 582 673 583 1 +E3T 1107 583 673 674 1 +E3T 1108 583 674 584 1 +E3T 1109 584 674 675 1 +E3T 1110 584 675 585 1 +E3T 1111 585 675 676 1 +E3T 1112 585 676 586 1 +E3T 1113 586 676 587 1 +E3T 1114 587 676 677 1 +E3T 1115 587 677 588 1 +E3T 1116 588 677 678 1 +E3T 1117 588 678 589 1 +E3T 1118 589 678 679 1 +E3T 1119 589 679 590 1 +E3T 1120 590 679 591 1 +E3T 1121 591 679 680 1 +E3T 1122 591 680 592 1 +E3T 1123 592 680 681 1 +E3T 1124 592 681 593 1 +E3T 1125 593 681 682 1 +E3T 1126 593 682 594 1 +E3T 1127 594 682 683 1 +E3T 1128 594 683 595 1 +E3T 1129 595 683 596 1 +E3T 1130 596 683 684 1 +E3T 1131 596 684 597 1 +E3T 1132 597 684 685 1 +E3T 1133 597 685 598 1 +E3T 1134 598 685 691 1 +E3T 1135 598 686 599 1 +E3T 1136 598 691 686 1 +E3T 1137 599 686 690 1 +E3T 1138 599 687 600 1 +E3T 1139 599 690 687 1 +E3T 1140 600 687 689 1 +E3T 1141 600 689 601 1 +E3T 1142 601 637 602 1 +E3T 1143 601 688 637 1 +E3T 1144 601 689 688 1 +E3T 1145 602 637 638 1 +E3T 1146 602 638 603 1 +E3T 1147 603 638 639 1 +E3T 1148 603 639 604 1 +E3T 1149 604 639 640 1 +E3T 1150 604 640 605 1 +E3T 1151 605 640 606 1 +E3T 1152 606 610 607 1 +E3T 1153 606 640 610 1 +E3T 1154 607 609 608 1 +E3T 1155 607 610 609 1 +E3T 1156 610 640 611 1 +E3T 1157 611 640 641 1 +E3T 1158 611 641 612 1 +E3T 1159 612 641 613 1 +E3T 1160 613 641 642 1 +E3T 1161 613 642 614 1 +E3T 1162 614 642 615 1 +E3T 1163 615 642 643 1 +E3T 1164 615 643 616 1 +E3T 1165 616 637 617 1 +E3T 1166 616 643 637 1 +E3T 1167 617 637 688 1 +E3T 1168 617 688 689 1 +E3T 1169 617 689 618 1 +E3T 1170 618 687 619 1 +E3T 1171 618 689 687 1 +E3T 1172 619 686 620 1 +E3T 1173 619 687 690 1 +E3T 1174 619 690 686 1 +E3T 1175 620 686 691 1 +E3T 1176 620 691 621 1 +E3T 1177 621 685 692 1 +E3T 1178 621 691 685 1 +E3T 1179 621 692 622 1 +E3T 1180 622 692 693 1 +E3T 1181 622 693 694 1 +E3T 1182 623 694 695 1 +E3T 1183 623 695 624 1 +E3T 1184 624 695 696 1 +E3T 1185 624 696 625 1 +E3T 1186 625 696 697 1 +E3T 1187 625 697 626 1 +E3T 1188 626 697 698 1 +E3T 1189 626 698 627 1 +E3T 1190 627 698 699 1 +E3T 1191 627 699 628 1 +E3T 1192 628 699 629 1 +E3T 1193 629 699 700 1 +E3T 1194 629 700 630 1 +E3T 1195 631 636 632 1 +E3T 1196 632 634 633 1 +E3T 1197 632 635 634 1 +E3T 1198 632 636 635 1 +E3T 1199 637 643 638 1 +E3T 1200 638 642 639 1 +E3T 1201 638 643 642 1 +E3T 1202 639 641 640 1 +E3T 1203 639 642 641 1 +E3T 1204 644 702 703 1 +E3T 1205 644 703 645 1 +E3T 1206 645 703 704 1 +E3T 1207 645 704 646 1 +E3T 1208 646 704 705 1 +E3T 1209 646 705 647 1 +E3T 1210 647 705 706 1 +E3T 1211 647 706 648 1 +E3T 1212 648 706 649 1 +E3T 1213 649 706 707 1 +E3T 1214 649 707 650 1 +E3T 1215 650 707 651 1 +E3T 1216 651 707 652 1 +E3T 1217 652 707 708 1 +E3T 1218 652 708 653 1 +E3T 1219 653 708 709 1 +E3T 1220 653 709 654 1 +E3T 1221 654 709 710 1 +E3T 1222 654 710 655 1 +E3T 1223 655 710 656 1 +E3T 1224 656 710 711 1 +E3T 1225 656 711 657 1 +E3T 1226 657 711 712 1 +E3T 1227 657 712 658 1 +E3T 1228 658 712 713 1 +E3T 1229 658 713 659 1 +E3T 1230 659 713 714 1 +E3T 1231 659 714 660 1 +E3T 1232 660 714 715 1 +E3T 1233 660 715 661 1 +E3T 1234 661 715 726 1 +E3T 1235 661 716 662 1 +E3T 1236 661 726 716 1 +E3T 1237 662 716 717 1 +E3T 1238 662 717 663 1 +E3T 1239 663 717 718 1 +E3T 1240 663 718 664 1 +E3T 1241 664 718 719 1 +E3T 1242 664 719 665 1 +E3T 1243 665 719 666 1 +E3T 1244 666 719 720 1 +E3T 1245 666 720 667 1 +E3T 1246 667 720 668 1 +E3T 1247 668 720 721 1 +E3T 1248 668 721 669 1 +E3T 1249 669 672 670 1 +E3T 1250 669 721 722 1 +E3T 1251 669 722 672 1 +E3T 1252 670 672 671 1 +E3T 1253 672 722 673 1 +E3T 1254 673 722 674 1 +E3T 1255 674 722 723 1 +E3T 1256 674 723 675 1 +E3T 1257 675 723 724 1 +E3T 1258 675 724 676 1 +E3T 1259 676 724 677 1 +E3T 1260 677 724 725 1 +E3T 1261 677 725 678 1 +E3T 1262 678 725 726 1 +E3T 1263 678 726 679 1 +E3T 1264 679 726 727 1 +E3T 1265 679 727 680 1 +E3T 1266 680 727 728 1 +E3T 1267 680 728 681 1 +E3T 1268 681 728 682 1 +E3T 1269 682 728 729 1 +E3T 1270 682 729 683 1 +E3T 1271 683 729 730 1 +E3T 1272 683 730 684 1 +E3T 1273 684 692 685 1 +E3T 1274 684 693 692 1 +E3T 1275 684 730 693 1 +E3T 1276 693 730 731 1 +E3T 1277 693 731 694 1 +E3T 1278 694 731 732 1 +E3T 1279 694 732 695 1 +E3T 1280 695 732 733 1 +E3T 1281 695 733 696 1 +E3T 1282 696 733 734 1 +E3T 1283 696 734 697 1 +E3T 1284 697 734 735 1 +E3T 1285 697 735 698 1 +E3T 1286 698 735 736 1 +E3T 1287 698 736 699 1 +E3T 1288 699 701 700 1 +E3T 1289 699 736 701 1 +E3T 1290 701 736 702 1 +E3T 1291 702 736 703 1 +E3T 1292 703 735 704 1 +E3T 1293 703 736 735 1 +E3T 1294 704 735 737 1 +E3T 1295 704 737 705 1 +E3T 1296 705 737 738 1 +E3T 1297 705 738 706 1 +E3T 1298 706 708 707 1 +E3T 1299 706 738 708 1 +E3T 1300 708 738 739 1 +E3T 1301 708 739 709 1 +E3T 1302 709 739 740 1 +E3T 1303 709 740 710 1 +E3T 1304 710 740 711 1 +E3T 1305 711 740 744 1 +E3T 1306 711 741 712 1 +E3T 1307 711 744 741 1 +E3T 1308 712 741 743 1 +E3T 1309 712 742 713 1 +E3T 1310 712 743 742 1 +E3T 1311 713 729 714 1 +E3T 1312 713 742 729 1 +E3T 1313 714 728 715 1 +E3T 1314 714 729 728 1 +E3T 1315 715 727 726 1 +E3T 1316 715 728 727 1 +E3T 1317 716 725 717 1 +E3T 1318 716 726 725 1 +E3T 1319 717 724 718 1 +E3T 1320 717 725 724 1 +E3T 1321 718 723 719 1 +E3T 1322 718 724 723 1 +E3T 1323 719 721 720 1 +E3T 1324 719 722 721 1 +E3T 1325 719 723 722 1 +E3T 1326 729 742 730 1 +E3T 1327 730 742 731 1 +E3T 1328 731 742 743 1 +E3T 1329 731 743 732 1 +E3T 1330 732 741 744 1 +E3T 1331 732 743 741 1 +E3T 1332 732 744 733 1 +E3T 1333 733 744 745 1 +E3T 1334 733 745 734 1 +E3T 1335 734 737 735 1 +E3T 1336 734 745 737 1 +E3T 1337 737 745 738 1 +E3T 1338 738 745 739 1 +E3T 1339 739 745 740 1 +E3T 1340 740 745 744 1 +ND 1 2634278.1 612371.326 0.0 +ND 2 2634419.31 612334.138 0.0 +ND 3 2634536.01 612240.973 0.0 +ND 4 2634659.18 612156.208 0.0 +ND 5 2634773.37 612059.058 0.0 +ND 6 2634879.2 611957.493 0.0 +ND 7 2635014.48 611892.36 0.0 +ND 8 2635151.09 611839.591 0.0 +ND 9 2635296.33 611804.574 0.0 +ND 10 2635434.78 611746.752 0.0 +ND 11 2635576.82 611697.999 0.0 +ND 12 2635706.39 611626.75 0.0 +ND 13 2635830.95 611553.393 0.0 +ND 14 2635980.69 611540.435 0.0 +ND 15 2636116.83 611485.7 0.0 +ND 16 2636253.52 611443.733 0.0 +ND 17 2636402.07 611452.858 0.0 +ND 18 2636547.27 611418.359 0.0 +ND 19 2636689.1 611373.74 0.0 +ND 20 2636837.24 611375.387 0.0 +ND 21 2636983.85 611408.26 0.0 +ND 22 2637066.47 611525.174 0.0 +ND 23 2637215.06 611547.794 0.0 +ND 24 2637358.49 611518.114 0.0 +ND 25 2637486.5 611446.064 0.0 +ND 26 2637562.8 611316.916 0.0 +ND 27 2637632.11 611189.701 0.0 +ND 28 2637742.65 611089.485 0.0 +ND 29 2637863.34 611007.315 0.0 +ND 30 2637954.15 610890.817 0.0 +ND 31 2638081.69 610811.288 0.0 +ND 32 2638218.02 610802.21 0.0 +ND 33 2638362.87 610833.236 0.0 +ND 34 2638500.11 610893.26 0.0 +ND 35 2638607.28 610847.904 0.0 +ND 36 2638694.19 610725.27 0.0 +ND 37 2638521.38 610623.225 0.0 +ND 38 2638527.94 610526.89 0.0 +ND 39 2638503.65 610473.426 0.0 +ND 40 2638488.65 610386.088 0.0 +ND 41 2638547.62 610311.463 0.0 +ND 42 2638503.3 610249.987 0.0 +ND 43 2638439.49 610245.233 0.0 +ND 44 2638350.01 610222.128 0.0 +ND 45 2638255.21 610211.866 0.0 +ND 46 2638252.35 610113.999 0.0 +ND 47 2638258.91 610017.664 0.0 +ND 48 2638265.47 609921.329 0.0 +ND 49 2638265.47 609822.276 0.0 +ND 50 2638274.91 609727.131 0.0 +ND 51 2638248.12 609644.702 0.0 +ND 52 2638162.02 609613.432 0.0 +ND 53 2638074.69 609585.15 0.0 +ND 54 2637991.74 609546.277 0.0 +ND 55 2637911.54 609500.745 0.0 +ND 56 2637831.89 609453.904 0.0 +ND 57 2637754.37 609401.92 0.0 +ND 58 2637678.36 609346.3 0.0 +ND 59 2637607.19 609288.257 0.0 +ND 60 2637533.31 609227.496 0.0 +ND 61 2637467.9 609155.533 0.0 +ND 62 2637397.86 609085.492 0.0 +ND 63 2637344.46 609012.403 0.0 +ND 64 2637286.42 608941.237 0.0 +ND 65 2637239.57 608861.586 0.0 +ND 66 2637183.45 608785.78 0.0 +ND 67 2637141.25 608704.208 0.0 +ND 68 2637108.33 608618.792 0.0 +ND 69 2637070.77 608535.298 0.0 +ND 70 2637037.84 608449.882 0.0 +ND 71 2637000.28 608366.388 0.0 +ND 72 2636972.0 608279.05 0.0 +ND 73 2636933.45 608195.964 0.0 +ND 74 2636901.51 608110.141 0.0 +ND 75 2636874.4 608022.319 0.0 +ND 76 2636840.31 607937.387 0.0 +ND 77 2636807.39 607851.971 0.0 +ND 78 2636774.46 607766.555 0.0 +ND 79 2636736.9 607683.061 0.0 +ND 80 2636703.98 607597.645 0.0 +ND 81 2636692.24 607500.367 0.0 +ND 82 2636679.83 607397.467 0.0 +ND 83 2636568.86 607410.684 0.0 +ND 84 2636431.04 607374.394 0.0 +ND 85 2636340.53 607301.89 0.0 +ND 86 2636268.72 607257.089 0.0 +ND 87 2636190.46 607232.043 0.0 +ND 88 2636115.72 607217.906 0.0 +ND 89 2636046.14 607216.097 0.0 +ND 90 2635964.57 607224.714 0.0 +ND 91 2635884.89 607245.169 0.0 +ND 92 2635811.05 607278.507 0.0 +ND 93 2635745.37 607319.844 0.0 +ND 94 2635686.11 607371.968 0.0 +ND 95 2635634.84 607436.393 0.0 +ND 96 2635581.5 607513.923 0.0 +ND 97 2635536.61 607591.555 0.0 +ND 98 2635497.9 607670.851 0.0 +ND 99 2635461.69 607754.9 0.0 +ND 100 2635428.76 607840.104 0.0 +ND 101 2635400.84 607924.514 0.0 +ND 102 2635381.89 608006.719 0.0 +ND 103 2635363.08 608107.197 0.0 +ND 104 2635346.41 608197.839 0.0 +ND 105 2635330.26 608284.974 0.0 +ND 106 2635326.45 608371.219 0.0 +ND 107 2635319.51 608476.625 0.0 +ND 108 2635311.32 608573.692 0.0 +ND 109 2635307.9 608666.945 0.0 +ND 110 2635310.25 608765.081 0.0 +ND 111 2635310.08 608862.103 0.0 +ND 112 2635319.35 608953.71 0.0 +ND 113 2635328.05 609064.029 0.0 +ND 114 2635331.98 609164.064 0.0 +ND 115 2635329.27 609265.805 0.0 +ND 116 2635336.17 609350.351 0.0 +ND 117 2635356.24 609439.971 0.0 +ND 118 2635365.91 609570.217 0.0 +ND 119 2635357.54 609663.077 0.0 +ND 120 2635355.2 609759.824 0.0 +ND 121 2635366.05 609854.813 0.0 +ND 122 2635357.94 609978.671 0.0 +ND 123 2635335.14 610081.894 0.0 +ND 124 2635320.85 610173.512 0.0 +ND 125 2635307.15 610273.147 0.0 +ND 126 2635301.05 610373.63 0.0 +ND 127 2635291.32 610474.575 0.0 +ND 128 2635279.83 610581.521 0.0 +ND 129 2635260.39 610684.412 0.0 +ND 130 2635228.01 610794.763 0.0 +ND 131 2635187.1 610901.335 0.0 +ND 132 2635133.5 610997.714 0.0 +ND 133 2635074.59 611086.842 0.0 +ND 134 2635016.42 611171.245 0.0 +ND 135 2634957.04 611251.615 0.0 +ND 136 2634900.19 611334.959 0.0 +ND 137 2634835.13 611425.754 0.0 +ND 138 2634763.17 611509.375 0.0 +ND 139 2634705.63 611582.06 0.0 +ND 140 2634642.12 611663.485 0.0 +ND 141 2634580.81 611739.381 0.0 +ND 142 2634521.08 611806.772 0.0 +ND 143 2634468.03 611870.674 0.0 +ND 144 2634424.92 611933.915 0.0 +ND 145 2634402.93 611986.686 0.0 +ND 146 2634389.82 612067.035 0.0 +ND 147 2634370.23 612187.527 0.0 +ND 148 2634309.84 612303.046 0.0 +ND 149 2637359.96 610694.568 0.0 +ND 150 2637442.23 610651.673 0.0 +ND 151 2637471.2 610563.641 0.0 +ND 152 2637527.22 610507.622 0.0 +ND 153 2637606.85 610458.348 0.0 +ND 154 2637684.01 610412.417 0.0 +ND 155 2637777.07 610421.819 0.0 +ND 156 2637806.15 610333.834 0.0 +ND 157 2637779.91 610252.359 0.0 +ND 158 2637776.15 610159.317 0.0 +ND 159 2637753.66 610068.6 0.0 +ND 160 2637699.01 609992.47 0.0 +ND 161 2637617.41 609964.684 0.0 +ND 162 2637644.41 609883.214 0.0 +ND 163 2637594.44 609808.743 0.0 +ND 164 2637509.63 609781.252 0.0 +ND 165 2637433.13 609724.437 0.0 +ND 166 2637387.19 609658.808 0.0 +ND 167 2637313.41 609604.711 0.0 +ND 168 2637229.43 609565.962 0.0 +ND 169 2637160.08 609510.436 0.0 +ND 170 2637124.87 609428.167 0.0 +ND 171 2637066.6 609364.464 0.0 +ND 172 2637063.07 609282.198 0.0 +ND 173 2636991.21 609223.461 0.0 +ND 174 2636924.79 609170.16 0.0 +ND 175 2636837.48 609152.577 0.0 +ND 176 2636742.88 609139.453 0.0 +ND 177 2636657.65 609139.668 0.0 +ND 178 2636577.68 609113.207 0.0 +ND 179 2636493.95 609086.96 0.0 +ND 180 2636420.13 609032.954 0.0 +ND 181 2636330.18 609021.741 0.0 +ND 182 2636296.97 608935.462 0.0 +ND 183 2636290.83 608843.757 0.0 +ND 184 2636319.81 608755.725 0.0 +ND 185 2636303.53 608670.694 0.0 +ND 186 2636320.63 608577.741 0.0 +ND 187 2636335.68 608483.944 0.0 +ND 188 2636396.73 608417.67 0.0 +ND 189 2636461.01 608379.663 0.0 +ND 190 2636429.11 608299.56 0.0 +ND 191 2636508.99 608260.19 0.0 +ND 192 2636585.22 608221.282 0.0 +ND 193 2636656.76 608161.765 0.0 +ND 194 2636713.38 608092.607 0.0 +ND 195 2636658.27 608030.532 0.0 +ND 196 2636598.81 607970.745 0.0 +ND 197 2636579.5 607886.175 0.0 +ND 198 2636541.13 607802.255 0.0 +ND 199 2636516.8 607712.301 0.0 +ND 200 2636437.15 607663.078 0.0 +ND 201 2636354.55 607630.27 0.0 +ND 202 2636264.16 607609.095 0.0 +ND 203 2636326.98 607544.968 0.0 +ND 204 2637025.32 610989.843 0.0 +ND 205 2637083.06 610932.101 0.0 +ND 206 2637136.16 610859.313 0.0 +ND 207 2637217.1 610798.056 0.0 +ND 208 2637280.61 610741.109 0.0 +ND 209 2637425.58 611150.749 0.0 +ND 210 2637450.95 611062.892 0.0 +ND 211 2637478.07 610975.755 0.0 +ND 212 2637484.19 610891.418 0.0 +ND 213 2637470.44 610811.609 0.0 +ND 214 2637419.44 610760.611 0.0 +ND 215 2635995.13 610163.073 0.0 +ND 216 2635975.45 610252.835 0.0 +ND 217 2635968.89 610348.033 0.0 +ND 218 2635955.76 610440.513 0.0 +ND 219 2635949.2 610535.711 0.0 +ND 220 2635929.52 610625.473 0.0 +ND 221 2635916.39 610717.953 0.0 +ND 222 2635903.27 610810.433 0.0 +ND 223 2635883.59 610900.195 0.0 +ND 224 2635877.02 610995.392 0.0 +ND 225 2635857.34 611085.154 0.0 +ND 226 2635850.78 611180.352 0.0 +ND 227 2635841.7 611274.509 0.0 +ND 228 2635811.41 611354.44 0.0 +ND 229 2637398.35 611229.727 0.0 +ND 230 2637345.65 611151.759 0.0 +ND 231 2637368.56 611047.405 0.0 +ND 232 2637367.76 610932.549 0.0 +ND 233 2637406.02 610843.943 0.0 +ND 234 2637319.95 610818.843 0.0 +ND 235 2637238.78 610903.828 0.0 +ND 236 2637140.57 610983.633 0.0 +ND 237 2637054.58 611069.327 0.0 +ND 238 2636965.21 611049.816 0.0 +ND 239 2636974.12 610950.799 0.0 +ND 240 2637027.75 610862.257 0.0 +ND 241 2637105.25 610774.335 0.0 +ND 242 2637193.72 610699.341 0.0 +ND 243 2637284.56 610651.392 0.0 +ND 244 2637363.21 610579.823 0.0 +ND 245 2637439.71 610483.607 0.0 +ND 246 2637526.06 610407.628 0.0 +ND 247 2637625.82 610347.401 0.0 +ND 248 2637722.36 610326.805 0.0 +ND 249 2637676.15 610228.274 0.0 +ND 250 2637675.47 610108.126 0.0 +ND 251 2637601.58 610042.524 0.0 +ND 252 2637551.81 609935.811 0.0 +ND 253 2637500.07 609856.224 0.0 +ND 254 2637411.71 609809.601 0.0 +ND 255 2637324.19 609725.748 0.0 +ND 256 2637224.93 609660.674 0.0 +ND 257 2637132.25 609590.351 0.0 +ND 258 2637061.72 609501.094 0.0 +ND 259 2637023.42 609413.66 0.0 +ND 260 2636964.27 609327.801 0.0 +ND 261 2636889.35 609249.245 0.0 +ND 262 2636784.06 609238.162 0.0 +ND 263 2636669.3 609219.382 0.0 +ND 264 2636552.86 609188.881 0.0 +ND 265 2636437.5 609148.501 0.0 +ND 266 2636335.66 609101.918 0.0 +ND 267 2636250.27 609028.946 0.0 +ND 268 2636215.88 608922.646 0.0 +ND 269 2636213.89 608807.162 0.0 +ND 270 2636234.72 608711.833 0.0 +ND 271 2636225.33 608610.028 0.0 +ND 272 2636249.46 608501.087 0.0 +ND 273 2636302.16 608402.917 0.0 +ND 274 2636363.99 608317.163 0.0 +ND 275 2636421.66 608218.918 0.0 +ND 276 2636506.27 608162.078 0.0 +ND 277 2636596.41 608119.895 0.0 +ND 278 2636537.04 608045.529 0.0 +ND 279 2636500.45 607932.313 0.0 +ND 280 2636473.8 607827.462 0.0 +ND 281 2636394.72 607750.329 0.0 +ND 282 2636285.5 607699.143 0.0 +ND 283 2636205.56 607641.713 0.0 +ND 284 2636225.62 607543.205 0.0 +ND 285 2636273.9 607463.599 0.0 +ND 286 2636358.9 607488.724 0.0 +ND 287 2636420.55 607564.45 0.0 +ND 288 2636524.22 607612.093 0.0 +ND 289 2636589.28 607711.747 0.0 +ND 290 2636630.91 607811.099 0.0 +ND 291 2636658.06 607916.816 0.0 +ND 292 2636720.01 607989.371 0.0 +ND 293 2636772.7 608088.246 0.0 +ND 294 2636740.77 608185.408 0.0 +ND 295 2636666.17 608261.428 0.0 +ND 296 2636570.29 608316.538 0.0 +ND 297 2636544.27 608398.228 0.0 +ND 298 2636461.53 608474.702 0.0 +ND 299 2636405.53 608562.555 0.0 +ND 300 2636397.51 608669.298 0.0 +ND 301 2636393.53 608794.031 0.0 +ND 302 2636381.07 608914.033 0.0 +ND 303 2636469.11 608968.853 0.0 +ND 304 2636550.45 609021.851 0.0 +ND 305 2636651.48 609046.495 0.0 +ND 306 2636771.04 609059.193 0.0 +ND 307 2636882.78 609077.053 0.0 +ND 308 2636987.96 609121.139 0.0 +ND 309 2637075.66 609190.739 0.0 +ND 310 2637141.81 609281.082 0.0 +ND 311 2637169.45 609368.313 0.0 +ND 312 2637237.08 609451.539 0.0 +ND 313 2637331.29 609521.225 0.0 +ND 314 2637406.65 609588.889 0.0 +ND 315 2637492.12 609656.055 0.0 +ND 316 2637588.62 609717.861 0.0 +ND 317 2637675.25 609792.999 0.0 +ND 318 2637734.72 609887.872 0.0 +ND 319 2637776.26 609975.014 0.0 +ND 320 2637831.13 610053.015 0.0 +ND 321 2637859.79 610168.685 0.0 +ND 322 2637877.61 610285.817 0.0 +ND 323 2637870.59 610412.877 0.0 +ND 324 2637788.46 610499.197 0.0 +ND 325 2637688.37 610504.331 0.0 +ND 326 2637594.95 610576.273 0.0 +ND 327 2637524.38 610645.164 0.0 +ND 328 2637499.08 610732.58 0.0 +ND 329 2637546.46 610819.702 0.0 +ND 330 2637561.18 610933.46 0.0 +ND 331 2637538.84 611029.586 0.0 +ND 332 2637505.39 611198.048 0.0 +ND 333 2637544.72 611109.929 0.0 +ND 334 2637641.98 611019.516 0.0 +ND 335 2637747.42 610928.353 0.0 +ND 336 2637850.07 610834.392 0.0 +ND 337 2637967.06 610745.198 0.0 +ND 338 2638103.93 610697.87 0.0 +ND 339 2638247.66 610678.879 0.0 +ND 340 2638349.24 610706.078 0.0 +ND 341 2638479.42 610736.907 0.0 +ND 342 2638433.28 610588.317 0.0 +ND 343 2638414.36 610470.569 0.0 +ND 344 2638416.8 610383.17 0.0 +ND 345 2638413.31 610309.371 0.0 +ND 346 2638290.55 610300.341 0.0 +ND 347 2638194.52 610260.419 0.0 +ND 348 2638166.12 610151.852 0.0 +ND 349 2638170.24 610023.683 0.0 +ND 350 2638168.95 609898.792 0.0 +ND 351 2638182.84 609788.917 0.0 +ND 352 2638134.51 609703.529 0.0 +ND 353 2638018.06 609655.303 0.0 +ND 354 2637929.81 609599.183 0.0 +ND 355 2637836.67 609561.657 0.0 +ND 356 2637738.02 609497.839 0.0 +ND 357 2637640.71 609428.045 0.0 +ND 358 2637545.05 609346.621 0.0 +ND 359 2637447.29 609266.553 0.0 +ND 360 2637365.92 609180.651 0.0 +ND 361 2637310.27 609092.624 0.0 +ND 362 2637237.21 609019.119 0.0 +ND 363 2637171.47 608914.435 0.0 +ND 364 2637100.0 608813.961 0.0 +ND 365 2637049.27 608707.744 0.0 +ND 366 2637002.75 608600.863 0.0 +ND 367 2636975.36 608503.07 0.0 +ND 368 2636926.58 608405.272 0.0 +ND 369 2636879.36 608294.223 0.0 +ND 370 2636837.16 608185.406 0.0 +ND 371 2636826.48 608076.075 0.0 +ND 372 2636783.88 607971.966 0.0 +ND 373 2636724.1 607865.264 0.0 +ND 374 2636684.8 607751.628 0.0 +ND 375 2636636.4 607647.25 0.0 +ND 376 2636604.64 607540.399 0.0 +ND 377 2636501.74 607496.508 0.0 +ND 378 2636413.38 607467.26 0.0 +ND 379 2636328.41 607403.865 0.0 +ND 380 2636228.32 607349.729 0.0 +ND 381 2636135.72 607292.263 0.0 +ND 382 2636035.44 607298.329 0.0 +ND 383 2635932.55 607323.676 0.0 +ND 384 2635834.52 607343.28 0.0 +ND 385 2635756.98 607423.341 0.0 +ND 386 2635684.24 607498.306 0.0 +ND 387 2635644.19 607587.22 0.0 +ND 388 2635590.51 607685.277 0.0 +ND 389 2635536.81 607795.78 0.0 +ND 390 2635492.4 607897.044 0.0 +ND 391 2635480.38 607997.391 0.0 +ND 392 2635449.25 608115.81 0.0 +ND 393 2635432.91 608238.723 0.0 +ND 394 2635405.76 608342.334 0.0 +ND 395 2635415.32 608448.903 0.0 +ND 396 2635402.63 608576.197 0.0 +ND 397 2635405.95 608705.376 0.0 +ND 398 2635408.04 608828.965 0.0 +ND 399 2635395.33 608948.449 0.0 +ND 400 2635425.29 609061.945 0.0 +ND 401 2635426.52 609185.405 0.0 +ND 402 2635431.3 609309.089 0.0 +ND 403 2635451.01 609430.751 0.0 +ND 404 2635461.1 609555.394 0.0 +ND 405 2635437.05 609673.693 0.0 +ND 406 2635460.98 609794.304 0.0 +ND 407 2635464.26 609922.42 0.0 +ND 408 2635447.46 610052.718 0.0 +ND 409 2635422.76 610177.72 0.0 +ND 410 2635386.43 610290.447 0.0 +ND 411 2635396.95 610413.774 0.0 +ND 412 2635384.48 610545.718 0.0 +ND 413 2635364.93 610676.036 0.0 +ND 414 2635330.68 610807.278 0.0 +ND 415 2635280.48 610936.225 0.0 +ND 416 2635207.61 611056.968 0.0 +ND 417 2635127.08 611160.767 0.0 +ND 418 2635072.7 611265.14 0.0 +ND 419 2634997.19 611376.706 0.0 +ND 420 2634906.26 611488.846 0.0 +ND 421 2634816.23 611584.844 0.0 +ND 422 2634771.09 611710.631 0.0 +ND 423 2634666.04 611779.9 0.0 +ND 424 2634597.25 611873.388 0.0 +ND 425 2634516.03 611963.671 0.0 +ND 426 2634453.44 612057.686 0.0 +ND 427 2634534.39 612100.814 0.0 +ND 428 2634645.17 612000.38 0.0 +ND 429 2634752.71 611886.204 0.0 +ND 430 2634892.38 611801.263 0.0 +ND 431 2635040.5 611743.867 0.0 +ND 432 2635196.11 611690.005 0.0 +ND 433 2635345.89 611634.779 0.0 +ND 434 2635496.21 611579.281 0.0 +ND 435 2635639.16 611523.692 0.0 +ND 436 2635756.42 611487.113 0.0 +ND 437 2635927.65 611434.608 0.0 +ND 438 2636039.97 611384.264 0.0 +ND 439 2636178.63 611341.314 0.0 +ND 440 2636336.58 611314.582 0.0 +ND 441 2636503.4 611296.94 0.0 +ND 442 2636652.96 611244.656 0.0 +ND 443 2636802.37 611252.312 0.0 +ND 444 2636950.93 611267.633 0.0 +ND 445 2637087.04 611349.871 0.0 +ND 446 2637223.54 611406.166 0.0 +ND 447 2637365.6 611365.435 0.0 +ND 448 2637458.97 611301.82 0.0 +ND 449 2635933.13 610116.076 0.0 +ND 450 2636025.56 610065.779 0.0 +ND 451 2636070.91 610152.653 0.0 +ND 452 2636064.04 610261.375 0.0 +ND 453 2636058.81 610383.778 0.0 +ND 454 2636031.85 610486.879 0.0 +ND 455 2636032.36 610589.968 0.0 +ND 456 2636009.77 610707.171 0.0 +ND 457 2635984.7 610834.95 0.0 +ND 458 2635974.34 610962.575 0.0 +ND 459 2635944.71 611067.167 0.0 +ND 460 2635939.14 611181.94 0.0 +ND 461 2635927.37 611312.745 0.0 +ND 462 2635850.02 611420.488 0.0 +ND 463 2635788.33 611408.179 0.0 +ND 464 2635707.24 611379.802 0.0 +ND 465 2635753.89 611250.558 0.0 +ND 466 2635765.48 611120.171 0.0 +ND 467 2635792.87 611017.798 0.0 +ND 468 2635792.91 610911.285 0.0 +ND 469 2635818.64 610787.368 0.0 +ND 470 2635831.21 610663.283 0.0 +ND 471 2635863.2 610562.815 0.0 +ND 472 2635862.27 610457.416 0.0 +ND 473 2635881.9 610334.457 0.0 +ND 474 2635896.21 610209.773 0.0 +ND 475 2636772.86 608287.589 0.0 +ND 476 2636679.53 608383.112 0.0 +ND 477 2636595.19 608481.954 0.0 +ND 478 2636506.13 608579.885 0.0 +ND 479 2636504.53 608708.671 0.0 +ND 480 2636486.68 608844.847 0.0 +ND 481 2636590.25 608913.596 0.0 +ND 482 2636709.69 608963.821 0.0 +ND 483 2636834.45 608968.522 0.0 +ND 484 2636982.06 609011.771 0.0 +ND 485 2637097.39 609109.258 0.0 +ND 486 2637189.98 609212.363 0.0 +ND 487 2637264.34 609333.315 0.0 +ND 488 2637346.12 609431.866 0.0 +ND 489 2637454.91 609512.821 0.0 +ND 490 2637568.96 609596.037 0.0 +ND 491 2637678.84 609678.401 0.0 +ND 492 2637777.42 609774.764 0.0 +ND 493 2637892.68 609892.603 0.0 +ND 494 2637937.3 610054.664 0.0 +ND 495 2637966.15 610195.745 0.0 +ND 496 2637992.36 610335.344 0.0 +ND 497 2637996.3 610473.564 0.0 +ND 498 2637859.92 610557.933 0.0 +ND 499 2637717.98 610622.399 0.0 +ND 500 2637609.99 610712.786 0.0 +ND 501 2637642.16 610857.649 0.0 +ND 502 2637735.7 610766.323 0.0 +ND 503 2637852.78 610682.836 0.0 +ND 504 2637990.9 610609.944 0.0 +ND 505 2638162.58 610548.459 0.0 +ND 506 2638326.99 610574.104 0.0 +ND 507 2638295.93 610464.851 0.0 +ND 508 2638334.45 610380.104 0.0 +ND 509 2638163.18 610385.217 0.0 +ND 510 2638088.92 610249.79 0.0 +ND 511 2638063.13 610109.94 0.0 +ND 512 2638044.86 609972.11 0.0 +ND 513 2638065.57 609842.204 0.0 +ND 514 2637997.21 609761.346 0.0 +ND 515 2637882.01 609708.803 0.0 +ND 516 2637762.74 609627.208 0.0 +ND 517 2637649.65 609544.83 0.0 +ND 518 2637537.85 609460.302 0.0 +ND 519 2637419.01 609369.243 0.0 +ND 520 2637320.19 609257.284 0.0 +ND 521 2637231.76 609136.938 0.0 +ND 522 2637129.9 609024.324 0.0 +ND 523 2637048.11 608915.48 0.0 +ND 524 2636975.28 608789.801 0.0 +ND 525 2636938.02 608671.277 0.0 +ND 526 2636876.05 608547.764 0.0 +ND 527 2636815.43 608409.565 0.0 +ND 528 2636050.94 611247.525 0.0 +ND 529 2636196.9 611195.383 0.0 +ND 530 2636359.42 611166.436 0.0 +ND 531 2636527.58 611138.184 0.0 +ND 532 2636706.2 611117.78 0.0 +ND 533 2636867.31 611121.992 0.0 +ND 534 2637059.36 611200.63 0.0 +ND 535 2637181.61 611241.655 0.0 +ND 536 2637293.53 611254.613 0.0 +ND 537 2637259.75 611121.29 0.0 +ND 538 2637256.93 611009.229 0.0 +ND 539 2637151.5 611102.631 0.0 +ND 540 2636981.78 611131.221 0.0 +ND 541 2636890.74 611000.536 0.0 +ND 542 2636904.01 610877.945 0.0 +ND 543 2636983.78 610755.568 0.0 +ND 544 2637093.49 610649.778 0.0 +ND 545 2637223.68 610560.285 0.0 +ND 546 2637338.69 610452.698 0.0 +ND 547 2637439.72 610348.964 0.0 +ND 548 2637549.16 610281.311 0.0 +ND 549 2637577.61 610161.39 0.0 +ND 550 2637497.64 610055.352 0.0 +ND 551 2637439.29 609933.323 0.0 +ND 552 2637323.07 609864.284 0.0 +ND 553 2637211.01 609774.896 0.0 +ND 554 2637096.78 609685.855 0.0 +ND 555 2636998.02 609578.023 0.0 +ND 556 2636943.7 609453.153 0.0 +ND 557 2636836.5 609369.643 0.0 +ND 558 2636719.58 609316.594 0.0 +ND 559 2636594.91 609305.656 0.0 +ND 560 2636458.08 609263.455 0.0 +ND 561 2636324.31 609205.185 0.0 +ND 562 2636208.46 609121.459 0.0 +ND 563 2636133.2 608996.284 0.0 +ND 564 2636114.66 608857.006 0.0 +ND 565 2636128.02 608699.866 0.0 +ND 566 2636139.5 608545.064 0.0 +ND 567 2636188.23 608411.905 0.0 +ND 568 2636265.38 608313.989 0.0 +ND 569 2636317.02 608208.585 0.0 +ND 570 2636409.2 608101.952 0.0 +ND 571 2636432.63 607996.709 0.0 +ND 572 2636364.27 607885.38 0.0 +ND 573 2636279.81 607791.851 0.0 +ND 574 2636169.52 607733.41 0.0 +ND 575 2636120.57 607612.972 0.0 +ND 576 2636143.47 607467.77 0.0 +ND 577 2636113.53 607367.664 0.0 +ND 578 2636006.0 607424.274 0.0 +ND 579 2635872.58 607433.568 0.0 +ND 580 2635784.24 607548.705 0.0 +ND 581 2635715.98 607676.082 0.0 +ND 582 2635641.02 607783.697 0.0 +ND 583 2635603.71 607915.728 0.0 +ND 584 2635572.05 608064.505 0.0 +ND 585 2635545.15 608208.844 0.0 +ND 586 2635503.0 608345.262 0.0 +ND 587 2635518.87 608486.994 0.0 +ND 588 2635513.34 608635.915 0.0 +ND 589 2635516.7 608788.474 0.0 +ND 590 2635498.25 608933.62 0.0 +ND 591 2635533.82 609072.453 0.0 +ND 592 2635534.58 609227.959 0.0 +ND 593 2635552.09 609385.055 0.0 +ND 594 2635572.21 609540.586 0.0 +ND 595 2635547.02 609685.362 0.0 +ND 596 2635579.12 609829.544 0.0 +ND 597 2635568.28 609990.009 0.0 +ND 598 2635546.12 610152.876 0.0 +ND 599 2635511.25 610316.594 0.0 +ND 600 2635501.78 610480.917 0.0 +ND 601 2635490.06 610633.326 0.0 +ND 602 2635456.12 610788.954 0.0 +ND 603 2635402.34 610945.343 0.0 +ND 604 2635326.47 611095.956 0.0 +ND 605 2635220.65 611213.647 0.0 +ND 606 2635156.68 611370.993 0.0 +ND 607 2635043.88 611498.4 0.0 +ND 608 2634926.61 611638.311 0.0 +ND 609 2635081.83 611611.981 0.0 +ND 610 2635234.07 611507.524 0.0 +ND 611 2635408.12 611459.081 0.0 +ND 612 2635562.13 611417.03 0.0 +ND 613 2635624.67 611274.715 0.0 +ND 614 2635672.26 611150.507 0.0 +ND 615 2635682.33 611002.745 0.0 +ND 616 2635702.74 610836.33 0.0 +ND 617 2635721.41 610689.021 0.0 +ND 618 2635754.13 610540.692 0.0 +ND 619 2635762.11 610382.871 0.0 +ND 620 2635792.5 610249.39 0.0 +ND 621 2635815.24 610113.69 0.0 +ND 622 2635943.52 610018.262 0.0 +ND 623 2636115.7 610080.467 0.0 +ND 624 2636166.25 610192.382 0.0 +ND 625 2636168.58 610336.981 0.0 +ND 626 2636144.81 610495.965 0.0 +ND 627 2636130.3 610657.781 0.0 +ND 628 2636088.21 610788.152 0.0 +ND 629 2636088.51 610926.415 0.0 +ND 630 2636059.24 611090.671 0.0 +ND 631 2636894.19 608870.293 0.0 +ND 632 2636800.03 608703.554 0.0 +ND 633 2636743.34 608526.568 0.0 +ND 634 2636640.15 608618.705 0.0 +ND 635 2636623.35 608765.009 0.0 +ND 636 2636736.97 608849.545 0.0 +ND 637 2635587.54 610764.991 0.0 +ND 638 2635514.02 610934.026 0.0 +ND 639 2635445.7 611114.584 0.0 +ND 640 2635334.52 611300.935 0.0 +ND 641 2635485.99 611284.978 0.0 +ND 642 2635562.38 611111.381 0.0 +ND 643 2635601.59 610925.816 0.0 +ND 644 2636762.45 610961.373 0.0 +ND 645 2636818.53 610773.54 0.0 +ND 646 2636935.73 610623.622 0.0 +ND 647 2637079.77 610496.696 0.0 +ND 648 2637218.61 610412.885 0.0 +ND 649 2637311.1 610290.659 0.0 +ND 650 2637428.72 610186.016 0.0 +ND 651 2637352.46 610026.78 0.0 +ND 652 2637204.1 609936.638 0.0 +ND 653 2637067.81 609822.148 0.0 +ND 654 2636933.71 609688.199 0.0 +ND 655 2636844.97 609532.896 0.0 +ND 656 2636688.84 609458.486 0.0 +ND 657 2636505.78 609410.814 0.0 +ND 658 2636331.87 609341.904 0.0 +ND 659 2636174.62 609247.376 0.0 +ND 660 2636058.59 609105.638 0.0 +ND 661 2635983.53 608927.182 0.0 +ND 662 2636001.01 608748.544 0.0 +ND 663 2636020.17 608567.421 0.0 +ND 664 2636070.63 608389.927 0.0 +ND 665 2636169.69 608259.962 0.0 +ND 666 2636240.18 608125.059 0.0 +ND 667 2636306.76 607999.567 0.0 +ND 668 2636184.99 607878.823 0.0 +ND 669 2636023.73 607765.217 0.0 +ND 670 2636014.11 607583.959 0.0 +ND 671 2635911.32 607536.634 0.0 +ND 672 2635868.76 607701.882 0.0 +ND 673 2635749.74 607833.798 0.0 +ND 674 2635720.77 608008.848 0.0 +ND 675 2635682.87 608189.31 0.0 +ND 676 2635628.84 608355.311 0.0 +ND 677 2635650.17 608530.952 0.0 +ND 678 2635649.37 608724.669 0.0 +ND 679 2635643.86 608919.969 0.0 +ND 680 2635667.77 609127.433 0.0 +ND 681 2635657.22 609296.843 0.0 +ND 682 2635700.27 609464.901 0.0 +ND 683 2635700.68 609667.23 0.0 +ND 684 2635718.23 609875.37 0.0 +ND 685 2635673.43 610054.571 0.0 +ND 686 2635649.13 610271.455 0.0 +ND 687 2635631.34 610451.624 0.0 +ND 688 2635609.08 610656.865 0.0 +ND 689 2635620.46 610569.941 0.0 +ND 690 2635640.57 610363.77 0.0 +ND 691 2635692.83 610173.609 0.0 +ND 692 2635795.53 609997.893 0.0 +ND 693 2635912.28 609900.482 0.0 +ND 694 2636094.16 609952.637 0.0 +ND 695 2636236.89 610058.756 0.0 +ND 696 2636292.21 610237.185 0.0 +ND 697 2636291.92 610431.367 0.0 +ND 698 2636274.43 610623.267 0.0 +ND 699 2636233.91 610825.994 0.0 +ND 700 2636209.61 611027.163 0.0 +ND 701 2636380.78 610989.415 0.0 +ND 702 2636570.83 610973.192 0.0 +ND 703 2636624.16 610777.55 0.0 +ND 704 2636728.76 610602.315 0.0 +ND 705 2636899.9 610440.858 0.0 +ND 706 2637091.03 610277.503 0.0 +ND 707 2637237.35 610130.5 0.0 +ND 708 2637037.75 610040.915 0.0 +ND 709 2636876.86 609849.874 0.0 +ND 710 2636747.24 609665.639 0.0 +ND 711 2636546.51 609612.863 0.0 +ND 712 2636330.88 609508.523 0.0 +ND 713 2636125.01 609404.079 0.0 +ND 714 2635983.13 609265.985 0.0 +ND 715 2635899.7 609061.114 0.0 +ND 716 2635889.78 608777.326 0.0 +ND 717 2635891.87 608572.294 0.0 +ND 718 2635936.13 608360.065 0.0 +ND 719 2636027.84 608153.102 0.0 +ND 720 2636161.35 608024.391 0.0 +ND 721 2636045.22 607946.233 0.0 +ND 722 2635892.16 607937.736 0.0 +ND 723 2635843.39 608159.756 0.0 +ND 724 2635782.02 608381.586 0.0 +ND 725 2635772.62 608622.083 0.0 +ND 726 2635791.49 608850.792 0.0 +ND 727 2635777.12 609041.798 0.0 +ND 728 2635810.04 609266.939 0.0 +ND 729 2635883.53 609493.28 0.0 +ND 730 2635878.36 609721.147 0.0 +ND 731 2636075.77 609783.358 0.0 +ND 732 2636276.19 609879.857 0.0 +ND 733 2636408.4 610080.453 0.0 +ND 734 2636452.91 610316.499 0.0 +ND 735 2636475.29 610565.036 0.0 +ND 736 2636420.47 610789.601 0.0 +ND 737 2636660.06 610399.043 0.0 +ND 738 2636857.77 610236.937 0.0 +ND 739 2636808.47 610028.029 0.0 +ND 740 2636660.58 609856.188 0.0 +ND 741 2636381.47 609699.418 0.0 +ND 742 2636078.7 609584.472 0.0 +ND 743 2636231.52 609681.152 0.0 +ND 744 2636483.44 609876.675 0.0 +ND 745 2636614.65 610134.552 0.0 diff --git a/xmsmesher/meshing/MeMultiPolyMesher.cpp b/xmsmesher/meshing/MeMultiPolyMesher.cpp index 7d514b44..79357dc2 100644 --- a/xmsmesher/meshing/MeMultiPolyMesher.cpp +++ b/xmsmesher/meshing/MeMultiPolyMesher.cpp @@ -114,12 +114,12 @@ namespace /// \param a_os[in]: the file /// \param a_interp[in]: the interpolation class //------------------------------------------------------------------------------ -void iWriteInterpDataToDebugFile(std::fstream& a_os, BSHP a_interp) +void iWriteInterpDataToDebugFile(std::ostream& a_os, BSHP a_interp) { BSHP ptsPtr = a_interp->GetPts(); BSHP idw = BDPC(a_interp); BSHP linear = BDPC(a_interp); - XM_ENSURE_TRUE(ptsPtr && (idw || linear)); + XM_ENSURE_TRUE_NO_ASSERT(ptsPtr && (idw || linear)); if (idw) a_os << "IDW"; else @@ -146,14 +146,14 @@ void iWriteInputsToDebugFile(MeMultiPolyMesherIo& a_io) for (size_t i = 0; i < a_io.m_polys.size(); ++i) { MePolyInput& poly(a_io.m_polys[i]); - os << "BEGIN_POLYGON\nOUTSIDE " << poly.m_outPoly.size() << "\n"; + os << "BEGIN_POLYGON\nOUTSIDE_3D " << poly.m_outPoly.size() << "\n"; for (auto& p : poly.m_outPoly) - os << STRstd(p.x) << " " << STRstd(p.y) << "\n"; + os << STRstd(p.x) << " " << STRstd(p.y) << " " << STRstd(p.z) << "\n"; for (auto& v : poly.m_insidePolys) { - os << "INSIDE " << v.size() << "\n"; + os << "INSIDE_3D " << v.size() << "\n"; for (auto& p : v) - os << STRstd(p.x) << " " << STRstd(p.y) << "\n"; + os << STRstd(p.x) << " " << STRstd(p.y) << " " << STRstd(p.z) << "\n"; } os << "BIAS " << STRstd(poly.m_bias) << "\n"; if (poly.m_sizeFunction) @@ -163,8 +163,12 @@ void iWriteInputsToDebugFile(MeMultiPolyMesherIo& a_io) } if (poly.m_elevFunction) { - os << "ELEVATION_FUNCTION\n"; - iWriteInterpDataToDebugFile(os, poly.m_elevFunction); + std::stringstream ss; + iWriteInterpDataToDebugFile(ss, poly.m_elevFunction); + if (!ss.str().empty()) { + os << "ELEVATION_FUNCTION\n"; + os << ss.str(); + } } if (poly.m_constSizeFunction != -1) { diff --git a/xmsmesher/meshing/MeMultiPolyTo2dm.cpp b/xmsmesher/meshing/MeMultiPolyTo2dm.cpp index 143aa0c4..f53323ed 100644 --- a/xmsmesher/meshing/MeMultiPolyTo2dm.cpp +++ b/xmsmesher/meshing/MeMultiPolyTo2dm.cpp @@ -854,5 +854,20 @@ void MeMultiPolyTo2dmIntermediateTests::testbug15186() { iTestFromPolyFile("bug15186", 10); } // MeMultiPolyTo2dmIntermediateTests::testbug15186 +//------------------------------------------------------------------------------ +/// \brief Test for a bug where z values on the polygon cause problems +//------------------------------------------------------------------------------ +void MeMultiPolyTo2dmIntermediateTests::testbug15246() +{ + iTestFromPolyFile("bug15246", 10); +} // MeMultiPolyTo2dmIntermediateTests::testbug15246 +//------------------------------------------------------------------------------ +/// \brief Test for a patch with Z elevations on the outside polygon +//------------------------------------------------------------------------------ +void MeMultiPolyTo2dmIntermediateTests::testPatch7() +{ + iTestFromPolyFile("CasePatch7", 10); +} // MeMultiPolyTo2dmIntermediateTests::testPatch7 + #endif // CXX_TEST diff --git a/xmsmesher/meshing/MeMultiPolyTo2dm.t.h b/xmsmesher/meshing/MeMultiPolyTo2dm.t.h index 150c7391..cab7dfa9 100644 --- a/xmsmesher/meshing/MeMultiPolyTo2dm.t.h +++ b/xmsmesher/meshing/MeMultiPolyTo2dm.t.h @@ -56,6 +56,8 @@ class MeMultiPolyTo2dmIntermediateTests : public CxxTest::TestSuite void testbug14901(); void testbug15183(); void testbug15186(); + void testbug15246(); + void testPatch7(); }; //} // namespace xms diff --git a/xmsmesher/meshing/MePolyMesher.cpp b/xmsmesher/meshing/MePolyMesher.cpp index 603bd0fc..73a2b863 100644 --- a/xmsmesher/meshing/MePolyMesher.cpp +++ b/xmsmesher/meshing/MePolyMesher.cpp @@ -153,6 +153,36 @@ class MePolyMesherImpl : public MePolyMesher }; // class MePolyMesherImpl //----- Internal functions ----------------------------------------------------- +namespace +{ + +//------------------------------------------------------------------------------ +/// \brief Sets the Z to 0.0 in a vector of Pt3d +//------------------------------------------------------------------------------ +static void iSetPt3dZtoZero(VecPt3d& a_vec, bool a_is_patch) +{ + if (a_is_patch) + return; + + for (auto& pt : a_vec) + pt.z = 0.0; +} // i_Set_Pt3d_Z_to_Zero +static void iSetPt3dZtoZero(VecPt3d2d& a_vec, bool a_is_patch) +{ + if (a_is_patch) + return; + for (auto& pts : a_vec) + iSetPt3dZtoZero(pts, a_is_patch); +} // iSetPt3dZtoZero +static void iSetPt3dZtoZero(std::vector& a_vec, bool a_is_patch) +{ + if (a_is_patch) + return; + for (auto& rpt : a_vec) + rpt.m_pt.z = 0.0; +} // iSetPt3dZtoZero + +} // un-named namespace //----- Class / Function definitions ------------------------------------------- @@ -240,6 +270,7 @@ bool MePolyMesherImpl::MeshIt(const MeMultiPolyMesherIo& a_input, // outer polygons const MePolyInput& polyInput = a_input.m_polys[a_polyIdx]; + bool is_patch(!polyInput.m_polyCorners.empty()); if (!polyInput.m_relaxationMethod.empty()) { @@ -249,16 +280,20 @@ bool MePolyMesherImpl::MeshIt(const MeMultiPolyMesherIo& a_input, m_polyId = polyInput.m_polyId; m_outPoly = polyInput.m_outPoly; + iSetPt3dZtoZero(m_outPoly, is_patch); m_seedPts = polyInput.m_seedPoints; m_relaxSeedPoints = polyInput.m_relaxSeedPoints; ComputeTolerance(); // holes inside the outer polygons m_inPolys = polyInput.m_insidePolys; + iSetPt3dZtoZero(m_inPolys, is_patch); // bias term m_bias = polyInput.m_bias; // refine pts - m_refineToPolys->SetRefinePoints(a_input.m_refPts, m_xyTol); + std::vector refPts = a_input.m_refPts; + iSetPt3dZtoZero(refPts, is_patch); + m_refineToPolys->SetRefinePoints(refPts, m_xyTol); m_refineToPolys->RefPtsAsPolys(polyInput.m_polyId, m_outPoly, m_inPolys, m_refPtPolys, m_refMeshPts, m_refPtsTooClose); // size function @@ -311,10 +346,13 @@ bool MePolyMesherImpl::MeshIt(const VecPt3d& a_outPoly, VecPt3d& a_points, VecInt& a_triangles) { + bool is_patch(false); m_outPoly = a_outPoly; + iSetPt3dZtoZero(m_outPoly, is_patch); ComputeTolerance(); SortPoly(m_outPoly); m_inPolys = a_inPolys; + iSetPt3dZtoZero(m_inPolys, is_patch); m_bias = a_bias; VecInt cells; return MeshFromInputs(a_points, a_triangles, cells); diff --git a/xmsmesher/tutorial/TutMeshing.cpp b/xmsmesher/tutorial/TutMeshing.cpp index e50e0f4f..1b032140 100644 --- a/xmsmesher/tutorial/TutMeshing.cpp +++ b/xmsmesher/tutorial/TutMeshing.cpp @@ -85,13 +85,16 @@ bool tutReadMeshIoFromFile(const std::string& a_fname, MeMultiPolyMesherIo& a_io a_io.m_polys.push_back(MePolyInput()); p = &a_io.m_polys.back(); } - else if ("OUTSIDE" == card && p) + else if (("OUTSIDE" == card || "OUTSIDE_3D" == card) && p) { + bool is_3d("OUTSIDE_3D" == card); os >> numpts; p->m_outPoly.reserve(numpts); for (size_t i = 0; i < numpts; ++i) { os >> pt.x >> pt.y; + if (is_3d) + os >> pt.z; p->m_outPoly.push_back(pt); } @@ -103,8 +106,9 @@ bool tutReadMeshIoFromFile(const std::string& a_fname, MeMultiPolyMesherIo& a_io area = gmPolygonArea(&vPoly[0], vPoly.size()); } } - else if ("INSIDE" == card && p) + else if (("INSIDE" == card || "INSIDE_3D" == card) && p) { + bool is_3d("INSIDE_3D" == card); p->m_insidePolys.push_back(VecPt3d()); std::vector& in(p->m_insidePolys.back()); os >> numpts; @@ -112,6 +116,8 @@ bool tutReadMeshIoFromFile(const std::string& a_fname, MeMultiPolyMesherIo& a_io for (size_t i = 0; i < numpts; ++i) { os >> pt.x >> pt.y; + if (is_3d) + os >> pt.z; in.push_back(pt); }