diff --git a/gold/generated-inputs/element_table/child_ids_1d_FG.dat b/gold/generated-inputs/element_table/child_ids_1d_FG.dat index deaa1be7..a3e6e3f3 100644 --- a/gold/generated-inputs/element_table/child_ids_1d_FG.dat +++ b/gold/generated-inputs/element_table/child_ids_1d_FG.dat @@ -1,7 +1,7 @@ -# Created from matlab git hash 5029884412036be83b4f6a559a60e9e75dbeae9f +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix -# rows: 63 +# rows: 127 # columns: 1 1 2 @@ -66,3 +66,67 @@ 61 62 63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 diff --git a/gold/generated-inputs/element_table/child_ids_1d_SG.dat b/gold/generated-inputs/element_table/child_ids_1d_SG.dat index 914a53f2..5dc0321b 100644 --- a/gold/generated-inputs/element_table/child_ids_1d_SG.dat +++ b/gold/generated-inputs/element_table/child_ids_1d_SG.dat @@ -1,8 +1,72 @@ -# Created from matlab git hash 5029884412036be83b4f6a559a60e9e75dbeae9f +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix -# rows: 63 +# rows: 127 # columns: 1 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 32 33 34 diff --git a/gold/generated-inputs/element_table/child_ids_2d_FG.dat b/gold/generated-inputs/element_table/child_ids_2d_FG.dat index 9fdd636a..e014dd1e 100644 --- a/gold/generated-inputs/element_table/child_ids_2d_FG.dat +++ b/gold/generated-inputs/element_table/child_ids_2d_FG.dat @@ -1,481 +1,481 @@ -# Created from matlab git hash 5029884412036be83b4f6a559a60e9e75dbeae9f +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 476 # columns: 1 1 -128 +256 2 3 -129 +257 4 5 -130 +258 6 7 -131 +259 8 9 -132 +260 10 11 -133 +261 12 13 -134 +262 14 15 -135 +263 16 17 -136 +264 18 19 -137 +265 20 21 -138 +266 22 23 -139 +267 24 25 -140 +268 26 27 -141 +269 28 29 -142 +270 30 31 -143 +271 32 33 -144 +272 34 35 -145 +273 36 37 -146 +274 38 39 -147 +275 40 41 -148 +276 42 43 -149 +277 44 45 -150 +278 46 47 -151 +279 48 49 -152 +280 50 51 -153 +281 52 53 -154 +282 54 55 -155 +283 56 57 -156 +284 58 59 -157 +285 60 61 -158 +286 62 63 -159 -129 -256 -384 -130 -131 -257 -385 -132 -133 -258 -386 -134 -135 -259 -387 -136 -137 -260 -388 -138 -139 -261 -389 -140 -141 -262 -390 -142 -143 -263 -391 -144 -145 -264 -392 -146 -147 -265 -393 -148 -149 -266 -394 -150 -151 -267 -395 -152 -153 -268 -396 -154 -155 -269 -397 -156 -157 -270 -398 -158 -159 -271 -399 -160 -161 -272 -400 -162 -163 -273 -401 -164 -165 -274 -402 -166 -167 -275 -403 -168 -169 -276 -404 -170 -171 -277 -405 -172 -173 -278 -406 -174 -175 -279 -407 -176 -177 -280 -408 -178 -179 -281 -409 -180 -181 -282 -410 -182 -183 -283 -411 -184 -185 -284 -412 -186 -187 -285 -413 -188 -189 -286 -414 -190 -191 287 -415 257 512 -640 -385 768 -896 258 259 513 -641 -386 -387 769 -897 260 261 514 -642 +770 262 263 515 -643 -388 -389 -770 -898 -390 -391 771 -899 264 265 516 -644 +772 266 267 517 -645 +773 268 269 518 -646 +774 270 271 519 -647 -392 -393 -772 -900 -394 -395 -773 -901 -396 -397 -774 -902 -398 -399 775 -903 272 273 520 -648 +776 274 275 521 -649 +777 276 277 522 -650 +778 278 279 523 -651 +779 280 281 524 -652 +780 282 283 525 -653 +781 284 285 526 -654 +782 286 287 527 -655 -400 -401 -776 -904 -402 -403 -777 -905 -404 -405 -778 -906 -406 -407 -779 -907 -408 -409 -780 -908 -410 -411 -781 -909 -412 -413 -782 -910 -414 -415 783 -911 288 289 528 -656 +784 290 291 529 -657 +785 292 293 530 -658 +786 294 295 531 -659 +787 296 297 532 -660 +788 298 299 533 -661 +789 300 301 534 -662 +790 302 303 535 -663 +791 304 305 536 -664 +792 306 307 537 -665 +793 308 309 538 -666 +794 310 311 539 -667 +795 312 313 540 -668 +796 314 315 541 -669 +797 316 317 542 -670 +798 318 319 543 -671 -416 -417 +799 +513 +1024 +1280 +769 +1536 +1792 +514 +515 +1025 +1281 +770 +771 +1537 +1793 +516 +517 +1026 +1282 +518 +519 +1027 +1283 +772 +773 +1538 +1794 +774 +775 +1539 +1795 +520 +521 +1028 +1284 +522 +523 +1029 +1285 +524 +525 +1030 +1286 +526 +527 +1031 +1287 +776 +777 +1540 +1796 +778 +779 +1541 +1797 +780 +781 +1542 +1798 +782 +783 +1543 +1799 +528 +529 +1032 +1288 +530 +531 +1033 +1289 +532 +533 +1034 +1290 +534 +535 +1035 +1291 +536 +537 +1036 +1292 +538 +539 +1037 +1293 +540 +541 +1038 +1294 +542 +543 +1039 +1295 784 -912 -418 -419 785 -913 -420 -421 +1544 +1800 786 -914 -422 -423 787 -915 -424 -425 +1545 +1801 788 -916 -426 -427 789 -917 -428 -429 +1546 +1802 790 -918 -430 -431 791 -919 -432 -433 +1547 +1803 792 -920 -434 -435 793 -921 -436 -437 +1548 +1804 794 -922 -438 -439 795 -923 -440 -441 +1549 +1805 796 -924 -442 -443 797 -925 -444 -445 +1550 +1806 798 -926 -446 -447 799 -927 +1551 +1807 +544 +545 +1040 +1296 +546 +547 +1041 +1297 +548 +549 +1042 +1298 +550 +551 +1043 +1299 +552 +553 +1044 +1300 +554 +555 +1045 +1301 +556 +557 +1046 +1302 +558 +559 +1047 +1303 +560 +561 +1048 +1304 +562 +563 +1049 +1305 +564 +565 +1050 +1306 +566 +567 +1051 +1307 +568 +569 +1052 +1308 +570 +571 +1053 +1309 +572 +573 +1054 +1310 +574 +575 +1055 +1311 +800 +801 +1552 +1808 +802 +803 +1553 +1809 +804 +805 +1554 +1810 +806 +807 +1555 +1811 +808 +809 +1556 +1812 +810 +811 +1557 +1813 +812 +813 +1558 +1814 +814 +815 +1559 +1815 +816 +817 +1560 +1816 +818 +819 +1561 +1817 +820 +821 +1562 +1818 +822 +823 +1563 +1819 +824 +825 +1564 +1820 +826 +827 +1565 +1821 +828 +829 +1566 +1822 +830 +831 +1567 +1823 diff --git a/gold/generated-inputs/element_table/child_ids_2d_SG.dat b/gold/generated-inputs/element_table/child_ids_2d_SG.dat index b8ff0be6..b2d60ea2 100644 --- a/gold/generated-inputs/element_table/child_ids_2d_SG.dat +++ b/gold/generated-inputs/element_table/child_ids_2d_SG.dat @@ -1,225 +1,225 @@ -# Created from matlab git hash 5029884412036be83b4f6a559a60e9e75dbeae9f +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 220 # columns: 1 32 33 -144 +272 34 35 -145 +273 36 37 -146 +274 38 39 -147 +275 40 41 -148 +276 42 43 -149 +277 44 45 -150 +278 46 47 -151 +279 48 49 -152 +280 50 51 -153 +281 52 53 -154 +282 54 55 -155 +283 56 57 -156 +284 58 59 -157 +285 60 61 -158 +286 62 63 -159 -144 -145 +287 +272 +273 +520 +776 +274 +275 +521 +777 +276 +277 +522 +778 +278 +279 +523 +779 +280 +281 +524 +780 +282 +283 +525 +781 +284 +285 +526 +782 +286 +287 +527 +783 +520 +521 +1028 +1284 +522 +523 +1029 +1285 +524 +525 +1030 +1286 +526 +527 +1031 +1287 +776 +777 +1540 +1796 +778 +779 +1541 +1797 +780 +781 +1542 +1798 +782 +783 +1543 +1799 +16 +17 264 -392 -146 -147 +18 +19 265 -393 -148 -149 +20 +21 266 -394 -150 -151 +22 +23 267 -395 -152 -153 +24 +25 268 -396 -154 -155 +26 +27 269 -397 -156 -157 +28 +29 270 -398 -158 -159 +30 +31 271 -399 264 265 516 -644 +772 266 267 517 -645 +773 268 269 518 -646 +774 270 271 519 -647 -392 -393 +775 +516 +517 +1026 +1282 +518 +519 +1027 +1283 772 -900 -394 -395 773 -901 -396 -397 +1538 +1794 774 -902 -398 -399 775 -903 -16 -17 -136 -18 -19 -137 -20 -21 -138 -22 -23 -139 -24 -25 -140 -26 -27 -141 -28 -29 -142 -30 -31 -143 -136 -137 +1539 +1795 +8 +9 260 -388 -138 -139 +10 +11 261 -389 -140 -141 +12 +13 262 -390 -142 -143 +14 +15 263 -391 260 261 514 -642 +770 262 263 515 -643 -388 -389 +771 +514 +515 +1025 +1281 770 -898 -390 -391 771 -899 -8 -9 -132 -10 -11 -133 -12 -13 -134 -14 -15 -135 -132 -133 +1537 +1793 +4 +5 258 -386 -134 -135 +6 +7 259 -387 258 259 513 -641 -386 -387 769 -897 -4 -5 -130 -6 -7 -131 -130 -131 +513 +1024 +1280 +769 +1536 +1792 +2 +3 257 -385 257 512 -640 -385 768 -896 -2 -3 -129 -129 -256 -384 1 -128 +256 diff --git a/gold/generated-inputs/element_table/child_ids_3d_FG.dat b/gold/generated-inputs/element_table/child_ids_3d_FG.dat index 9b47baeb..eb8f2d0e 100644 --- a/gold/generated-inputs/element_table/child_ids_3d_FG.dat +++ b/gold/generated-inputs/element_table/child_ids_3d_FG.dat @@ -1,1413 +1,1413 @@ -# Created from matlab git hash 5029884412036be83b4f6a559a60e9e75dbeae9f +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 1408 # columns: 1 1 -128 -16384 +256 +65536 2 3 -129 -16385 +257 +65537 4 5 -130 -16386 +258 +65538 6 7 -131 -16387 +259 +65539 8 9 -132 -16388 +260 +65540 10 11 -133 -16389 +261 +65541 12 13 -134 -16390 +262 +65542 14 15 -135 -16391 -129 -256 -384 -16512 -130 -131 -257 -385 -16513 -132 -133 -258 -386 -16514 -134 -135 -259 -387 -16515 -136 -137 -260 -388 -16516 -138 -139 -261 -389 -16517 -140 -141 -262 -390 -16518 -142 -143 263 -391 -16519 +65543 257 512 -640 -16640 -385 768 -896 -16768 +65792 258 259 513 -641 -16641 -386 -387 769 -897 -16769 +65793 260 261 514 -642 -16642 +770 +65794 262 263 515 -643 -16643 -388 -389 -770 -898 -16770 -390 -391 771 -899 -16771 +65795 264 265 516 -644 -16644 +772 +65796 266 267 517 -645 -16645 +773 +65797 268 269 518 -646 -16646 +774 +65798 270 271 519 -647 -16647 -392 -393 +775 +65799 +513 +1024 +1280 +66048 +769 +1536 +1792 +66304 +514 +515 +1025 +1281 +66049 +770 +771 +1537 +1793 +66305 +516 +517 +1026 +1282 +66050 +518 +519 +1027 +1283 +66051 772 -900 -16772 -394 -395 773 -901 -16773 -396 -397 +1538 +1794 +66306 774 -902 -16774 -398 -399 775 -903 -16775 -16385 -16512 -32768 -49152 -16386 -16387 -16513 -32769 -49153 -16388 -16389 -16514 -32770 -49154 -16390 -16391 -16515 -32771 -49155 -16392 -16393 -16516 -32772 -49156 -16394 -16395 -16517 -32773 -49157 -16396 -16397 -16518 -32774 -49158 -16398 -16399 -16519 -32775 -49159 -16513 -16640 -16768 -32896 -49280 -16514 -16515 -16641 -16769 -32897 -49281 -16516 -16517 -16642 -16770 -32898 -49282 -16518 -16519 -16643 -16771 -32899 -49283 -16520 -16521 -16644 -16772 -32900 -49284 -16522 -16523 -16645 -16773 -32901 -49285 -16524 -16525 -16646 -16774 -32902 -49286 -16526 -16527 -16647 -16775 -32903 -49287 -16641 -16896 -17024 -33024 -49408 -16769 -17152 -17280 -33152 -49536 -16642 -16643 -16897 -17025 -33025 -49409 -16770 -16771 -17153 -17281 -33153 -49537 -16644 -16645 -16898 -17026 -33026 -49410 -16646 -16647 -16899 -17027 -33027 -49411 -16772 -16773 -17154 -17282 -33154 -49538 -16774 -16775 -17155 -17283 -33155 -49539 -16648 -16649 -16900 -17028 -33028 -49412 -16650 -16651 -16901 -17029 -33029 -49413 -16652 -16653 -16902 -17030 -33030 -49414 -16654 -16655 -16903 -17031 -33031 -49415 -16776 -16777 -17156 -17284 -33156 -49540 -16778 -16779 -17157 -17285 -33157 -49541 -16780 -16781 -17158 -17286 -33158 -49542 -16782 -16783 -17159 -17287 -33159 -49543 -32769 -32896 -65536 -81920 -49153 -49280 -98304 -114688 -32770 -32771 -32897 +1539 +1795 +66307 +520 +521 +1028 +1284 +66052 +522 +523 +1029 +1285 +66053 +524 +525 +1030 +1286 +66054 +526 +527 +1031 +1287 +66055 +776 +777 +1540 +1796 +66308 +778 +779 +1541 +1797 +66309 +780 +781 +1542 +1798 +66310 +782 +783 +1543 +1799 +66311 65537 -81921 -49154 -49155 -49281 -98305 -114689 -32772 -32773 -32898 -65538 -81922 -32774 -32775 -32899 -65539 -81923 -49156 -49157 -49282 -98306 -114690 -49158 -49159 -49283 -98307 -114691 -32776 -32777 -32900 -65540 -81924 -32778 -32779 -32901 -65541 -81925 -32780 -32781 -32902 -65542 -81926 -32782 -32783 -32903 -65543 -81927 -49160 -49161 -49284 -98308 -114692 -49162 -49163 -49285 -98309 -114693 -49164 -49165 -49286 -98310 -114694 -49166 -49167 -49287 -98311 -114695 -32897 -33024 -33152 -65664 -82048 -49281 -49408 -49536 -98432 -114816 -32898 -32899 -33025 -33153 -65665 -82049 -49282 -49283 -49409 -49537 -98433 -114817 -32900 -32901 -33026 -33154 -65666 -82050 -32902 -32903 -33027 -33155 -65667 -82051 -49284 -49285 -49410 -49538 -98434 -114818 -49286 -49287 -49411 -49539 -98435 -114819 -32904 -32905 -33028 -33156 -65668 -82052 -32906 -32907 -33029 -33157 -65669 -82053 -32908 -32909 -33030 -33158 -65670 -82054 -32910 -32911 -33031 -33159 -65671 -82055 -49288 -49289 -49412 -49540 -98436 -114820 -49290 -49291 -49413 -49541 -98437 -114821 -49292 -49293 -49414 -49542 -98438 -114822 -49294 -49295 -49415 -49543 -98439 -114823 -33025 -33280 -33408 65792 -82176 -33153 -33536 -33664 -65920 -82304 -49409 -49664 -49792 -98560 -114944 -49537 -49920 -50048 -98688 -115072 -33026 -33027 -33281 -33409 -65793 -82177 -33154 -33155 -33537 -33665 -65921 -82305 -49410 -49411 -49665 -49793 -98561 -114945 -49538 -49539 -49921 -50049 -98689 -115073 -33028 -33029 -33282 -33410 -65794 -82178 -33030 -33031 -33283 -33411 -65795 -82179 -33156 -33157 -33538 -33666 -65922 -82306 -33158 -33159 -33539 -33667 -65923 -82307 -49412 -49413 -49666 -49794 -98562 -114946 -49414 -49415 -49667 -49795 -98563 -114947 -49540 -49541 -49922 -50050 -98690 -115074 -49542 -49543 -49923 -50051 -98691 -115075 -33032 -33033 -33284 -33412 -65796 -82180 -33034 -33035 -33285 -33413 -65797 -82181 -33036 -33037 -33286 -33414 -65798 -82182 -33038 -33039 -33287 -33415 -65799 -82183 -33160 -33161 -33540 -33668 -65924 -82308 -33162 -33163 -33541 -33669 -65925 -82309 -33164 -33165 -33542 -33670 -65926 -82310 -33166 -33167 -33543 -33671 -65927 -82311 -49416 -49417 -49668 -49796 -98564 -114948 -49418 -49419 -49669 -49797 -98565 -114949 -49420 -49421 -49670 -49798 -98566 -114950 -49422 -49423 -49671 -49799 -98567 -114951 -49544 -49545 -49924 -50052 -98692 -115076 -49546 -49547 -49925 -50053 -98693 -115077 -49548 -49549 -49926 -50054 -98694 -115078 -49550 -49551 -49927 -50055 -98695 -115079 -65537 -65664 131072 -147456 -81921 -82048 -163840 -180224 -98305 -98432 196608 -212992 -114689 -114816 -229376 -245760 65538 65539 -65665 +65793 131073 -147457 -81922 -81923 -82049 -163841 -180225 -98306 -98307 -98433 196609 -212993 -114690 -114691 -114817 -229377 -245761 65540 65541 -65666 +65794 131074 -147458 +196610 65542 65543 -65667 +65795 131075 -147459 -81924 -81925 -82050 -163842 -180226 -81926 -81927 -82051 -163843 -180227 -98308 -98309 -98434 -196610 -212994 -98310 -98311 -98435 196611 -212995 -114692 -114693 -114818 -229378 -245762 -114694 -114695 -114819 -229379 -245763 65544 65545 -65668 +65796 131076 -147460 +196612 65546 65547 -65669 +65797 131077 -147461 +196613 65548 65549 -65670 +65798 131078 -147462 +196614 65550 65551 -65671 +65799 131079 -147463 -81928 -81929 -82052 -163844 -180228 -81930 -81931 -82053 -163845 -180229 -81932 -81933 -82054 -163846 -180230 -81934 -81935 -82055 -163847 -180231 -98312 -98313 -98436 -196612 -212996 -98314 -98315 -98437 -196613 -212997 -98316 -98317 -98438 -196614 -212998 -98318 -98319 -98439 196615 -212999 -114696 -114697 -114820 -229380 -245764 -114698 -114699 -114821 -229381 -245765 -114700 -114701 -114822 -229382 -245766 -114702 -114703 -114823 -229383 -245767 -65665 -65792 -65920 -131200 -147584 -82049 -82176 -82304 -163968 -180352 -98433 -98560 -98688 -196736 -213120 -114817 -114944 -115072 -229504 -245888 -65666 -65667 -65793 -65921 -131201 -147585 -82050 -82051 -82177 -82305 -163969 -180353 -98434 -98435 -98561 -98689 -196737 -213121 -114818 -114819 -114945 -115073 -229505 -245889 -65668 -65669 -65794 -65922 -131202 -147586 -65670 -65671 -65795 -65923 -131203 -147587 -82052 -82053 -82178 -82306 -163970 -180354 -82054 -82055 -82179 -82307 -163971 -180355 -98436 -98437 -98562 -98690 -196738 -213122 -98438 -98439 -98563 -98691 -196739 -213123 -114820 -114821 -114946 -115074 -229506 -245890 -114822 -114823 -114947 -115075 -229507 -245891 -65672 -65673 -65796 -65924 -131204 -147588 -65674 -65675 -65797 -65925 -131205 -147589 -65676 -65677 -65798 -65926 -131206 -147590 -65678 -65679 -65799 -65927 -131207 -147591 -82056 -82057 -82180 -82308 -163972 -180356 -82058 -82059 -82181 -82309 -163973 -180357 -82060 -82061 -82182 -82310 -163974 -180358 -82062 -82063 -82183 -82311 -163975 -180359 -98440 -98441 -98564 -98692 -196740 -213124 -98442 -98443 -98565 -98693 -196741 -213125 -98444 -98445 -98566 -98694 -196742 -213126 -98446 -98447 -98567 -98695 -196743 -213127 -114824 -114825 -114948 -115076 -229508 -245892 -114826 -114827 -114949 -115077 -229509 -245893 -114828 -114829 -114950 -115078 -229510 -245894 -114830 -114831 -114951 -115079 -229511 -245895 65793 66048 -66176 -131328 -147712 -65921 66304 -66432 -131456 -147840 -82177 -82432 -82560 -164096 -180480 -82305 -82688 -82816 -164224 -180608 -98561 -98816 -98944 +131328 196864 -213248 -98689 -99072 -99200 -196992 -213376 -114945 -115200 -115328 -229632 -246016 -115073 -115456 -115584 -229760 -246144 65794 65795 66049 -66177 -131329 -147713 -65922 -65923 66305 -66433 -131457 -147841 -82178 -82179 -82433 -82561 -164097 -180481 -82306 -82307 -82689 -82817 -164225 -180609 -98562 -98563 -98817 -98945 +131329 196865 -213249 -98690 -98691 -99073 -99201 -196993 -213377 -114946 -114947 -115201 -115329 -229633 -246017 -115074 -115075 -115457 -115585 -229761 -246145 65796 65797 66050 -66178 +66306 131330 -147714 +196866 65798 65799 66051 -66179 -131331 -147715 -65924 -65925 -66306 -66434 -131458 -147842 -65926 -65927 66307 -66435 -131459 -147843 -82180 -82181 -82434 -82562 -164098 -180482 -82182 -82183 -82435 -82563 -164099 -180483 -82308 -82309 -82690 -82818 -164226 -180610 -82310 -82311 -82691 -82819 -164227 -180611 -98564 -98565 -98818 -98946 -196866 -213250 -98566 -98567 -98819 -98947 +131331 196867 -213251 -98692 -98693 -99074 -99202 -196994 -213378 -98694 -98695 -99075 -99203 -196995 -213379 -114948 -114949 -115202 -115330 -229634 -246018 -114950 -114951 -115203 -115331 -229635 -246019 -115076 -115077 -115458 -115586 -229762 -246146 -115078 -115079 -115459 -115587 -229763 -246147 65800 65801 66052 -66180 +66308 131332 -147716 +196868 65802 65803 66053 -66181 +66309 131333 -147717 +196869 65804 65805 66054 -66182 +66310 131334 -147718 +196870 65806 65807 66055 -66183 +66311 131335 -147719 -65928 -65929 +196871 +66049 +66560 +66816 +131584 +197120 +66305 +67072 +67328 +131840 +197376 +66050 +66051 +66561 +66817 +131585 +197121 +66306 +66307 +67073 +67329 +131841 +197377 +66052 +66053 +66562 +66818 +131586 +197122 +66054 +66055 +66563 +66819 +131587 +197123 66308 -66436 -131460 -147844 -65930 -65931 66309 -66437 -131461 -147845 -65932 -65933 +67074 +67330 +131842 +197378 66310 -66438 -131462 -147846 -65934 -65935 66311 -66439 -131463 -147847 -82184 -82185 -82436 -82564 -164100 -180484 -82186 -82187 -82437 -82565 -164101 -180485 -82188 -82189 -82438 -82566 -164102 -180486 -82190 -82191 -82439 -82567 -164103 -180487 -82312 -82313 -82692 -82820 -164228 -180612 -82314 -82315 -82693 -82821 -164229 -180613 -82316 -82317 -82694 -82822 -164230 -180614 -82318 -82319 -82695 -82823 -164231 -180615 -98568 -98569 -98820 -98948 +67075 +67331 +131843 +197379 +66056 +66057 +66564 +66820 +131588 +197124 +66058 +66059 +66565 +66821 +131589 +197125 +66060 +66061 +66566 +66822 +131590 +197126 +66062 +66063 +66567 +66823 +131591 +197127 +66312 +66313 +67076 +67332 +131844 +197380 +66314 +66315 +67077 +67333 +131845 +197381 +66316 +66317 +67078 +67334 +131846 +197382 +66318 +66319 +67079 +67335 +131847 +197383 +131073 +131328 +262144 +327680 +196609 +196864 +393216 +458752 +131074 +131075 +131329 +262145 +327681 +196610 +196611 +196865 +393217 +458753 +131076 +131077 +131330 +262146 +327682 +131078 +131079 +131331 +262147 +327683 +196612 +196613 +196866 +393218 +458754 +196614 +196615 +196867 +393219 +458755 +131080 +131081 +131332 +262148 +327684 +131082 +131083 +131333 +262149 +327685 +131084 +131085 +131334 +262150 +327686 +131086 +131087 +131335 +262151 +327687 +196616 +196617 +196868 +393220 +458756 +196618 +196619 +196869 +393221 +458757 +196620 +196621 +196870 +393222 +458758 +196622 +196623 +196871 +393223 +458759 +131329 +131584 +131840 +262400 +327936 +196865 +197120 +197376 +393472 +459008 +131330 +131331 +131585 +131841 +262401 +327937 +196866 +196867 +197121 +197377 +393473 +459009 +131332 +131333 +131586 +131842 +262402 +327938 +131334 +131335 +131587 +131843 +262403 +327939 196868 -213252 -98570 -98571 -98821 -98949 196869 -213253 -98572 -98573 -98822 -98950 +197122 +197378 +393474 +459010 196870 -213254 -98574 -98575 -98823 -98951 196871 -213255 -98696 -98697 -99076 -99204 -196996 -213380 -98698 -98699 -99077 -99205 -196997 -213381 -98700 -98701 -99078 -99206 -196998 -213382 -98702 -98703 -99079 -99207 -196999 -213383 -114952 -114953 -115204 -115332 -229636 -246020 -114954 -114955 -115205 -115333 -229637 -246021 -114956 -114957 -115206 -115334 -229638 -246022 -114958 -114959 -115207 -115335 -229639 -246023 -115080 -115081 -115460 -115588 -229764 -246148 -115082 -115083 -115461 -115589 -229765 -246149 -115084 -115085 -115462 -115590 -229766 -246150 -115086 -115087 -115463 -115591 -229767 -246151 +197123 +197379 +393475 +459011 +131336 +131337 +131588 +131844 +262404 +327940 +131338 +131339 +131589 +131845 +262405 +327941 +131340 +131341 +131590 +131846 +262406 +327942 +131342 +131343 +131591 +131847 +262407 +327943 +196872 +196873 +197124 +197380 +393476 +459012 +196874 +196875 +197125 +197381 +393477 +459013 +196876 +196877 +197126 +197382 +393478 +459014 +196878 +196879 +197127 +197383 +393479 +459015 +131585 +132096 +132352 +262656 +328192 +131841 +132608 +132864 +262912 +328448 +197121 +197632 +197888 +393728 +459264 +197377 +198144 +198400 +393984 +459520 +131586 +131587 +132097 +132353 +262657 +328193 +131842 +131843 +132609 +132865 +262913 +328449 +197122 +197123 +197633 +197889 +393729 +459265 +197378 +197379 +198145 +198401 +393985 +459521 +131588 +131589 +132098 +132354 +262658 +328194 +131590 +131591 +132099 +132355 +262659 +328195 +131844 +131845 +132610 +132866 +262914 +328450 +131846 +131847 +132611 +132867 +262915 +328451 +197124 +197125 +197634 +197890 +393730 +459266 +197126 +197127 +197635 +197891 +393731 +459267 +197380 +197381 +198146 +198402 +393986 +459522 +197382 +197383 +198147 +198403 +393987 +459523 +131592 +131593 +132100 +132356 +262660 +328196 +131594 +131595 +132101 +132357 +262661 +328197 +131596 +131597 +132102 +132358 +262662 +328198 +131598 +131599 +132103 +132359 +262663 +328199 +131848 +131849 +132612 +132868 +262916 +328452 +131850 +131851 +132613 +132869 +262917 +328453 +131852 +131853 +132614 +132870 +262918 +328454 +131854 +131855 +132615 +132871 +262919 +328455 +197128 +197129 +197636 +197892 +393732 +459268 +197130 +197131 +197637 +197893 +393733 +459269 +197132 +197133 +197638 +197894 +393734 +459270 +197134 +197135 +197639 +197895 +393735 +459271 +197384 +197385 +198148 +198404 +393988 +459524 +197386 +197387 +198149 +198405 +393989 +459525 +197388 +197389 +198150 +198406 +393990 +459526 +197390 +197391 +198151 +198407 +393991 +459527 +262145 +262400 +524288 +589824 +327681 +327936 +655360 +720896 +393217 +393472 +786432 +851968 +458753 +459008 +917504 +983040 +262146 +262147 +262401 +524289 +589825 +327682 +327683 +327937 +655361 +720897 +393218 +393219 +393473 +786433 +851969 +458754 +458755 +459009 +917505 +983041 +262148 +262149 +262402 +524290 +589826 +262150 +262151 +262403 +524291 +589827 +327684 +327685 +327938 +655362 +720898 +327686 +327687 +327939 +655363 +720899 +393220 +393221 +393474 +786434 +851970 +393222 +393223 +393475 +786435 +851971 +458756 +458757 +459010 +917506 +983042 +458758 +458759 +459011 +917507 +983043 +262152 +262153 +262404 +524292 +589828 +262154 +262155 +262405 +524293 +589829 +262156 +262157 +262406 +524294 +589830 +262158 +262159 +262407 +524295 +589831 +327688 +327689 +327940 +655364 +720900 +327690 +327691 +327941 +655365 +720901 +327692 +327693 +327942 +655366 +720902 +327694 +327695 +327943 +655367 +720903 +393224 +393225 +393476 +786436 +851972 +393226 +393227 +393477 +786437 +851973 +393228 +393229 +393478 +786438 +851974 +393230 +393231 +393479 +786439 +851975 +458760 +458761 +459012 +917508 +983044 +458762 +458763 +459013 +917509 +983045 +458764 +458765 +459014 +917510 +983046 +458766 +458767 +459015 +917511 +983047 +262401 +262656 +262912 +524544 +590080 +327937 +328192 +328448 +655616 +721152 +393473 +393728 +393984 +786688 +852224 +459009 +459264 +459520 +917760 +983296 +262402 +262403 +262657 +262913 +524545 +590081 +327938 +327939 +328193 +328449 +655617 +721153 +393474 +393475 +393729 +393985 +786689 +852225 +459010 +459011 +459265 +459521 +917761 +983297 +262404 +262405 +262658 +262914 +524546 +590082 +262406 +262407 +262659 +262915 +524547 +590083 +327940 +327941 +328194 +328450 +655618 +721154 +327942 +327943 +328195 +328451 +655619 +721155 +393476 +393477 +393730 +393986 +786690 +852226 +393478 +393479 +393731 +393987 +786691 +852227 +459012 +459013 +459266 +459522 +917762 +983298 +459014 +459015 +459267 +459523 +917763 +983299 +262408 +262409 +262660 +262916 +524548 +590084 +262410 +262411 +262661 +262917 +524549 +590085 +262412 +262413 +262662 +262918 +524550 +590086 +262414 +262415 +262663 +262919 +524551 +590087 +327944 +327945 +328196 +328452 +655620 +721156 +327946 +327947 +328197 +328453 +655621 +721157 +327948 +327949 +328198 +328454 +655622 +721158 +327950 +327951 +328199 +328455 +655623 +721159 +393480 +393481 +393732 +393988 +786692 +852228 +393482 +393483 +393733 +393989 +786693 +852229 +393484 +393485 +393734 +393990 +786694 +852230 +393486 +393487 +393735 +393991 +786695 +852231 +459016 +459017 +459268 +459524 +917764 +983300 +459018 +459019 +459269 +459525 +917765 +983301 +459020 +459021 +459270 +459526 +917766 +983302 +459022 +459023 +459271 +459527 +917767 +983303 +262657 +263168 +263424 +524800 +590336 +262913 +263680 +263936 +525056 +590592 +328193 +328704 +328960 +655872 +721408 +328449 +329216 +329472 +656128 +721664 +393729 +394240 +394496 +786944 +852480 +393985 +394752 +395008 +787200 +852736 +459265 +459776 +460032 +918016 +983552 +459521 +460288 +460544 +918272 +983808 +262658 +262659 +263169 +263425 +524801 +590337 +262914 +262915 +263681 +263937 +525057 +590593 +328194 +328195 +328705 +328961 +655873 +721409 +328450 +328451 +329217 +329473 +656129 +721665 +393730 +393731 +394241 +394497 +786945 +852481 +393986 +393987 +394753 +395009 +787201 +852737 +459266 +459267 +459777 +460033 +918017 +983553 +459522 +459523 +460289 +460545 +918273 +983809 +262660 +262661 +263170 +263426 +524802 +590338 +262662 +262663 +263171 +263427 +524803 +590339 +262916 +262917 +263682 +263938 +525058 +590594 +262918 +262919 +263683 +263939 +525059 +590595 +328196 +328197 +328706 +328962 +655874 +721410 +328198 +328199 +328707 +328963 +655875 +721411 +328452 +328453 +329218 +329474 +656130 +721666 +328454 +328455 +329219 +329475 +656131 +721667 +393732 +393733 +394242 +394498 +786946 +852482 +393734 +393735 +394243 +394499 +786947 +852483 +393988 +393989 +394754 +395010 +787202 +852738 +393990 +393991 +394755 +395011 +787203 +852739 +459268 +459269 +459778 +460034 +918018 +983554 +459270 +459271 +459779 +460035 +918019 +983555 +459524 +459525 +460290 +460546 +918274 +983810 +459526 +459527 +460291 +460547 +918275 +983811 +262664 +262665 +263172 +263428 +524804 +590340 +262666 +262667 +263173 +263429 +524805 +590341 +262668 +262669 +263174 +263430 +524806 +590342 +262670 +262671 +263175 +263431 +524807 +590343 +262920 +262921 +263684 +263940 +525060 +590596 +262922 +262923 +263685 +263941 +525061 +590597 +262924 +262925 +263686 +263942 +525062 +590598 +262926 +262927 +263687 +263943 +525063 +590599 +328200 +328201 +328708 +328964 +655876 +721412 +328202 +328203 +328709 +328965 +655877 +721413 +328204 +328205 +328710 +328966 +655878 +721414 +328206 +328207 +328711 +328967 +655879 +721415 +328456 +328457 +329220 +329476 +656132 +721668 +328458 +328459 +329221 +329477 +656133 +721669 +328460 +328461 +329222 +329478 +656134 +721670 +328462 +328463 +329223 +329479 +656135 +721671 +393736 +393737 +394244 +394500 +786948 +852484 +393738 +393739 +394245 +394501 +786949 +852485 +393740 +393741 +394246 +394502 +786950 +852486 +393742 +393743 +394247 +394503 +786951 +852487 +393992 +393993 +394756 +395012 +787204 +852740 +393994 +393995 +394757 +395013 +787205 +852741 +393996 +393997 +394758 +395014 +787206 +852742 +393998 +393999 +394759 +395015 +787207 +852743 +459272 +459273 +459780 +460036 +918020 +983556 +459274 +459275 +459781 +460037 +918021 +983557 +459276 +459277 +459782 +460038 +918022 +983558 +459278 +459279 +459783 +460039 +918023 +983559 +459528 +459529 +460292 +460548 +918276 +983812 +459530 +459531 +460293 +460549 +918277 +983813 +459532 +459533 +460294 +460550 +918278 +983814 +459534 +459535 +460295 +460551 +918279 +983815 diff --git a/gold/generated-inputs/element_table/child_ids_3d_SG.dat b/gold/generated-inputs/element_table/child_ids_3d_SG.dat index ebb6e365..96b260b4 100644 --- a/gold/generated-inputs/element_table/child_ids_3d_SG.dat +++ b/gold/generated-inputs/element_table/child_ids_3d_SG.dat @@ -1,157 +1,157 @@ -# Created from matlab git hash 5029884412036be83b4f6a559a60e9e75dbeae9f +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 152 # columns: 1 8 9 -132 -16388 +260 +65540 10 11 -133 -16389 +261 +65541 12 13 -134 -16390 +262 +65542 14 15 -135 -16391 -132 -133 +263 +65543 +260 +261 +514 +770 +65794 +262 +263 +515 +771 +65795 +514 +515 +1025 +1281 +66049 +770 +771 +1537 +1793 +66305 +65540 +65541 +65794 +131074 +196610 +65542 +65543 +65795 +131075 +196611 +65794 +65795 +66049 +66305 +131329 +196865 +66049 +66560 +66816 +131584 +197120 +66305 +67072 +67328 +131840 +197376 +131074 +131075 +131329 +262145 +327681 +196610 +196611 +196865 +393217 +458753 +131329 +131584 +131840 +262400 +327936 +196865 +197120 +197376 +393472 +459008 +262145 +262400 +524288 +589824 +327681 +327936 +655360 +720896 +393217 +393472 +786432 +851968 +458753 +459008 +917504 +983040 +4 +5 258 -386 -16514 -134 -135 +65538 +6 +7 259 -387 -16515 +65539 258 259 513 -641 -16641 -386 -387 769 -897 -16769 -16388 -16389 -16514 -32770 -49154 -16390 -16391 -16515 -32771 -49155 -16514 -16515 -16641 -16769 -32897 -49281 -16641 -16896 -17024 -33024 -49408 -16769 -17152 -17280 -33152 -49536 -32770 -32771 -32897 -65537 -81921 -49154 -49155 -49281 -98305 -114689 -32897 -33024 -33152 -65664 -82048 -49281 -49408 -49536 -98432 -114816 -65537 -65664 -131072 -147456 -81921 -82048 -163840 -180224 -98305 -98432 -196608 -212992 -114689 -114816 -229376 -245760 -4 -5 -130 -16386 -6 -7 -131 -16387 -130 -131 +65793 +513 +1024 +1280 +66048 +769 +1536 +1792 +66304 +65538 +65539 +65793 +131073 +196609 +65793 +66048 +66304 +131328 +196864 +131073 +131328 +262144 +327680 +196609 +196864 +393216 +458752 +2 +3 257 -385 -16513 +65537 257 512 -640 -16640 -385 768 -896 -16768 -16386 -16387 -16513 -32769 -49153 -16513 -16640 -16768 -32896 -49280 -32769 -32896 -65536 -81920 -49153 -49280 -98304 -114688 -2 -3 -129 -16385 -129 -256 -384 -16512 -16385 -16512 -32768 -49152 +65792 +65537 +65792 +131072 +196608 1 -128 -16384 +256 +65536 diff --git a/gold/generated-inputs/element_table/ids_2d_FG.dat b/gold/generated-inputs/element_table/ids_2d_FG.dat index c4e8293b..bf12c399 100644 --- a/gold/generated-inputs/element_table/ids_2d_FG.dat +++ b/gold/generated-inputs/element_table/ids_2d_FG.dat @@ -1,4 +1,4 @@ -# Created from matlab git hash 35e1f0babe3f66a54cae995de01de3ac542832e8 +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 128 @@ -35,54 +35,14 @@ 29 30 31 -128 -129 -130 -131 -132 -133 -134 -135 -136 -137 -138 -139 -140 -141 -142 -143 -144 -145 -146 -147 -148 -149 -150 -151 -152 -153 -154 -155 -156 -157 -158 -159 256 -384 257 -385 258 259 -386 -387 260 261 262 263 -388 -389 -390 -391 264 265 266 @@ -91,14 +51,6 @@ 269 270 271 -392 -393 -394 -395 -396 -397 -398 -399 272 273 274 @@ -115,19 +67,67 @@ 285 286 287 -400 -401 -402 -403 -404 -405 -406 -407 -408 -409 -410 -411 -412 -413 -414 -415 +512 +768 +513 +769 +514 +515 +770 +771 +516 +517 +518 +519 +772 +773 +774 +775 +520 +521 +522 +523 +524 +525 +526 +527 +776 +777 +778 +779 +780 +781 +782 +783 +528 +529 +530 +531 +532 +533 +534 +535 +536 +537 +538 +539 +540 +541 +542 +543 +784 +785 +786 +787 +788 +789 +790 +791 +792 +793 +794 +795 +796 +797 +798 +799 diff --git a/gold/generated-inputs/element_table/ids_2d_SG.dat b/gold/generated-inputs/element_table/ids_2d_SG.dat index b5085101..df686ecf 100644 --- a/gold/generated-inputs/element_table/ids_2d_SG.dat +++ b/gold/generated-inputs/element_table/ids_2d_SG.dat @@ -1,4 +1,4 @@ -# Created from matlab git hash 35e1f0babe3f66a54cae995de01de3ac542832e8 +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 64 @@ -19,22 +19,22 @@ 29 30 31 -136 -137 -138 -139 -140 -141 -142 -143 -260 -261 -262 -263 -388 -389 -390 -391 +264 +265 +266 +267 +268 +269 +270 +271 +516 +517 +518 +519 +772 +773 +774 +775 8 9 10 @@ -43,27 +43,27 @@ 13 14 15 -132 -133 -134 -135 -258 -259 -386 -387 +260 +261 +262 +263 +514 +515 +770 +771 4 5 6 7 -130 -131 -257 -385 +258 +259 +513 +769 2 3 -129 -256 -384 +257 +512 +768 1 -128 +256 0 diff --git a/gold/generated-inputs/element_table/ids_3d_FG.dat b/gold/generated-inputs/element_table/ids_3d_FG.dat index 86112e3c..b3258d37 100644 --- a/gold/generated-inputs/element_table/ids_3d_FG.dat +++ b/gold/generated-inputs/element_table/ids_3d_FG.dat @@ -1,4 +1,4 @@ -# Created from matlab git hash 35e1f0babe3f66a54cae995de01de3ac542832e8 +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 256 @@ -11,251 +11,251 @@ 5 6 7 -128 -129 -130 -131 -132 -133 -134 -135 256 -384 257 -385 258 259 -386 -387 260 261 262 263 -388 -389 -390 -391 -16384 -16385 -16386 -16387 -16388 -16389 -16390 -16391 -16512 -16513 -16514 -16515 -16516 -16517 -16518 -16519 -16640 -16768 -16641 -16769 -16642 -16643 -16770 -16771 -16644 -16645 -16646 -16647 -16772 -16773 -16774 -16775 -32768 -49152 -32769 -49153 -32770 -32771 -49154 -49155 -32772 -32773 -32774 -32775 -49156 -49157 -49158 -49159 -32896 -49280 -32897 -49281 -32898 -32899 -49282 -49283 -32900 -32901 -32902 -32903 -49284 -49285 -49286 -49287 -33024 -33152 -49408 -49536 -33025 -33153 -49409 -49537 -33026 -33027 -33154 -33155 -49410 -49411 -49538 -49539 -33028 -33029 -33030 -33031 -33156 -33157 -33158 -33159 -49412 -49413 -49414 -49415 -49540 -49541 -49542 -49543 +512 +768 +513 +769 +514 +515 +770 +771 +516 +517 +518 +519 +772 +773 +774 +775 65536 -81920 -98304 -114688 65537 -81921 -98305 -114689 65538 65539 -81922 -81923 -98306 -98307 -114690 -114691 65540 65541 65542 65543 -81924 -81925 -81926 -81927 -98308 -98309 -98310 -98311 -114692 -114693 -114694 -114695 -65664 -82048 -98432 -114816 -65665 -82049 -98433 -114817 -65666 -65667 -82050 -82051 -98434 -98435 -114818 -114819 -65668 -65669 -65670 -65671 -82052 -82053 -82054 -82055 -98436 -98437 -98438 -98439 -114820 -114821 -114822 -114823 65792 -65920 -82176 -82304 -98560 -98688 -114944 -115072 65793 -65921 -82177 -82305 -98561 -98689 -114945 -115073 65794 65795 -65922 -65923 -82178 -82179 -82306 -82307 -98562 -98563 -98690 -98691 -114946 -114947 -115074 -115075 65796 65797 65798 65799 -65924 -65925 -65926 -65927 -82180 -82181 -82182 -82183 -82308 -82309 -82310 -82311 -98564 -98565 -98566 -98567 -98692 -98693 -98694 -98695 -114948 -114949 -114950 -114951 -115076 -115077 -115078 -115079 +66048 +66304 +66049 +66305 +66050 +66051 +66306 +66307 +66052 +66053 +66054 +66055 +66308 +66309 +66310 +66311 +131072 +196608 +131073 +196609 +131074 +131075 +196610 +196611 +131076 +131077 +131078 +131079 +196612 +196613 +196614 +196615 +131328 +196864 +131329 +196865 +131330 +131331 +196866 +196867 +131332 +131333 +131334 +131335 +196868 +196869 +196870 +196871 +131584 +131840 +197120 +197376 +131585 +131841 +197121 +197377 +131586 +131587 +131842 +131843 +197122 +197123 +197378 +197379 +131588 +131589 +131590 +131591 +131844 +131845 +131846 +131847 +197124 +197125 +197126 +197127 +197380 +197381 +197382 +197383 +262144 +327680 +393216 +458752 +262145 +327681 +393217 +458753 +262146 +262147 +327682 +327683 +393218 +393219 +458754 +458755 +262148 +262149 +262150 +262151 +327684 +327685 +327686 +327687 +393220 +393221 +393222 +393223 +458756 +458757 +458758 +458759 +262400 +327936 +393472 +459008 +262401 +327937 +393473 +459009 +262402 +262403 +327938 +327939 +393474 +393475 +459010 +459011 +262404 +262405 +262406 +262407 +327940 +327941 +327942 +327943 +393476 +393477 +393478 +393479 +459012 +459013 +459014 +459015 +262656 +262912 +328192 +328448 +393728 +393984 +459264 +459520 +262657 +262913 +328193 +328449 +393729 +393985 +459265 +459521 +262658 +262659 +262914 +262915 +328194 +328195 +328450 +328451 +393730 +393731 +393986 +393987 +459266 +459267 +459522 +459523 +262660 +262661 +262662 +262663 +262916 +262917 +262918 +262919 +328196 +328197 +328198 +328199 +328452 +328453 +328454 +328455 +393732 +393733 +393734 +393735 +393988 +393989 +393990 +393991 +459268 +459269 +459270 +459271 +459524 +459525 +459526 +459527 diff --git a/gold/generated-inputs/element_table/ids_3d_SG.dat b/gold/generated-inputs/element_table/ids_3d_SG.dat index 37bc9379..c743b47d 100644 --- a/gold/generated-inputs/element_table/ids_3d_SG.dat +++ b/gold/generated-inputs/element_table/ids_3d_SG.dat @@ -1,4 +1,4 @@ -# Created from matlab git hash 35e1f0babe3f66a54cae995de01de3ac542832e8 +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 34 @@ -7,33 +7,33 @@ 5 6 7 -130 -131 -257 -385 -16386 -16387 -16513 -16640 -16768 -32769 -49153 -32896 -49280 -65536 -81920 -98304 -114688 +258 +259 +513 +769 +65538 +65539 +65793 +66048 +66304 +131073 +196609 +131328 +196864 +262144 +327680 +393216 +458752 2 3 -129 -256 -384 -16385 -16512 -32768 -49152 +257 +512 +768 +65537 +65792 +131072 +196608 1 -128 -16384 +256 +65536 0 diff --git a/gold/generated-inputs/matlab_utilities/linspace_neg1_1_8.dat b/gold/generated-inputs/matlab_utilities/linspace_neg1_1_8.dat index a4d1c726..eb871390 100644 --- a/gold/generated-inputs/matlab_utilities/linspace_neg1_1_8.dat +++ b/gold/generated-inputs/matlab_utilities/linspace_neg1_1_8.dat @@ -1,6 +1,6 @@ -# Created from matlab git hash 15d6ecd77b971f955de2852a201e878a95b43822 +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 1 # columns: 8 --1 -0.7142857142857143 -0.4285714285714285 -0.1428571428571428 0.1428571428571428 0.4285714285714285 0.7142857142857143 1 +-1 -0.7142857142857143 -0.4285714285714286 -0.1428571428571429 0.1428571428571428 0.4285714285714286 0.7142857142857142 1 diff --git a/gold/generated-inputs/matlab_utilities/read_vector_bin_neg1_1_100.dat b/gold/generated-inputs/matlab_utilities/read_vector_bin_neg1_1_100.dat index 8456f08a..e2dd3da7 100644 Binary files a/gold/generated-inputs/matlab_utilities/read_vector_bin_neg1_1_100.dat and b/gold/generated-inputs/matlab_utilities/read_vector_bin_neg1_1_100.dat differ diff --git a/gold/generated-inputs/matlab_utilities/read_vector_bin_neg1_1_100T.dat b/gold/generated-inputs/matlab_utilities/read_vector_bin_neg1_1_100T.dat index 8456f08a..e2dd3da7 100644 Binary files a/gold/generated-inputs/matlab_utilities/read_vector_bin_neg1_1_100T.dat and b/gold/generated-inputs/matlab_utilities/read_vector_bin_neg1_1_100T.dat differ diff --git a/gold/generated-inputs/matlab_utilities/read_vector_txt_neg1_1_100.dat b/gold/generated-inputs/matlab_utilities/read_vector_txt_neg1_1_100.dat index 284cd91a..060d84eb 100644 --- a/gold/generated-inputs/matlab_utilities/read_vector_txt_neg1_1_100.dat +++ b/gold/generated-inputs/matlab_utilities/read_vector_txt_neg1_1_100.dat @@ -1,6 +1,6 @@ -# Created from matlab git hash 15d6ecd77b971f955de2852a201e878a95b43822 +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 1 # columns: 100 --1 -0.9797979797979798 -0.9595959595959596 -0.9393939393939394 -0.9191919191919192 -0.898989898989899 -0.8787878787878788 -0.8585858585858586 -0.8383838383838383 -0.8181818181818182 -0.797979797979798 -0.7777777777777778 -0.7575757575757576 -0.7373737373737373 -0.7171717171717171 -0.696969696969697 -0.6767676767676768 -0.6565656565656566 -0.6363636363636364 -0.6161616161616161 -0.5959595959595959 -0.5757575757575758 -0.5555555555555556 -0.5353535353535354 -0.5151515151515151 -0.494949494949495 -0.4747474747474748 -0.4545454545454545 -0.4343434343434344 -0.4141414141414141 -0.3939393939393939 -0.3737373737373738 -0.3535353535353535 -0.3333333333333333 -0.3131313131313131 -0.2929292929292929 -0.2727272727272727 -0.2525252525252525 -0.2323232323232323 -0.2121212121212121 -0.1919191919191919 -0.1717171717171717 -0.1515151515151515 -0.1313131313131313 -0.1111111111111111 -0.09090909090909091 -0.0707070707070707 -0.0505050505050505 -0.0303030303030303 -0.0101010101010101 0.0101010101010101 0.0303030303030303 0.0505050505050505 0.0707070707070707 0.09090909090909091 0.1111111111111111 0.1313131313131313 0.1515151515151515 0.1717171717171717 0.1919191919191919 0.2121212121212121 0.2323232323232323 0.2525252525252525 0.2727272727272727 0.2929292929292929 0.3131313131313131 0.3333333333333333 0.3535353535353535 0.3737373737373738 0.3939393939393939 0.4141414141414141 0.4343434343434344 0.4545454545454545 0.4747474747474748 0.494949494949495 0.5151515151515151 0.5353535353535354 0.5555555555555556 0.5757575757575758 0.5959595959595959 0.6161616161616161 0.6363636363636364 0.6565656565656566 0.6767676767676768 0.696969696969697 0.7171717171717171 0.7373737373737373 0.7575757575757576 0.7777777777777778 0.797979797979798 0.8181818181818182 0.8383838383838383 0.8585858585858586 0.8787878787878788 0.898989898989899 0.9191919191919192 0.9393939393939394 0.9595959595959596 0.9797979797979798 1 +-1 -0.9797979797979798 -0.9595959595959596 -0.9393939393939394 -0.9191919191919192 -0.898989898989899 -0.8787878787878788 -0.8585858585858586 -0.8383838383838383 -0.8181818181818181 -0.797979797979798 -0.7777777777777778 -0.7575757575757576 -0.7373737373737373 -0.7171717171717171 -0.696969696969697 -0.6767676767676767 -0.6565656565656566 -0.6363636363636364 -0.6161616161616161 -0.595959595959596 -0.5757575757575757 -0.5555555555555556 -0.5353535353535354 -0.5151515151515151 -0.4949494949494949 -0.4747474747474747 -0.4545454545454546 -0.4343434343434344 -0.4141414141414141 -0.3939393939393939 -0.3737373737373737 -0.3535353535353535 -0.3333333333333334 -0.3131313131313131 -0.2929292929292929 -0.2727272727272727 -0.2525252525252525 -0.2323232323232324 -0.2121212121212122 -0.1919191919191919 -0.1717171717171717 -0.1515151515151515 -0.1313131313131313 -0.1111111111111112 -0.09090909090909094 -0.07070707070707072 -0.0505050505050505 -0.03030303030303028 -0.01010101010101006 0.01010101010101017 0.03030303030303028 0.05050505050505061 0.07070707070707072 0.09090909090909083 0.1111111111111112 0.1313131313131313 0.1515151515151516 0.1717171717171717 0.1919191919191918 0.2121212121212122 0.2323232323232323 0.2525252525252526 0.2727272727272727 0.292929292929293 0.3131313131313131 0.3333333333333333 0.3535353535353536 0.3737373737373737 0.393939393939394 0.4141414141414141 0.4343434343434343 0.4545454545454546 0.4747474747474747 0.494949494949495 0.5151515151515151 0.5353535353535352 0.5555555555555556 0.5757575757575757 0.595959595959596 0.6161616161616161 0.6363636363636365 0.6565656565656566 0.6767676767676767 0.696969696969697 0.7171717171717171 0.7373737373737375 0.7575757575757576 0.7777777777777777 0.797979797979798 0.8181818181818181 0.8383838383838385 0.8585858585858586 0.8787878787878789 0.898989898989899 0.9191919191919191 0.9393939393939394 0.9595959595959596 0.9797979797979799 1 diff --git a/gold/generated-inputs/matlab_utilities/read_vector_txt_neg1_1_100T.dat b/gold/generated-inputs/matlab_utilities/read_vector_txt_neg1_1_100T.dat index 36f19b2d..4142751d 100644 --- a/gold/generated-inputs/matlab_utilities/read_vector_txt_neg1_1_100T.dat +++ b/gold/generated-inputs/matlab_utilities/read_vector_txt_neg1_1_100T.dat @@ -1,4 +1,4 @@ -# Created from matlab git hash 15d6ecd77b971f955de2852a201e878a95b43822 +# Created from matlab git hash 88d5ed852c06746169389081f8981de2355f335e # name: foo # type: matrix # rows: 100 @@ -12,94 +12,94 @@ -0.8787878787878788 -0.8585858585858586 -0.8383838383838383 --0.8181818181818182 +-0.8181818181818181 -0.797979797979798 -0.7777777777777778 -0.7575757575757576 -0.7373737373737373 -0.7171717171717171 -0.696969696969697 --0.6767676767676768 +-0.6767676767676767 -0.6565656565656566 -0.6363636363636364 -0.6161616161616161 --0.5959595959595959 --0.5757575757575758 +-0.595959595959596 +-0.5757575757575757 -0.5555555555555556 -0.5353535353535354 -0.5151515151515151 --0.494949494949495 --0.4747474747474748 --0.4545454545454545 +-0.4949494949494949 +-0.4747474747474747 +-0.4545454545454546 -0.4343434343434344 -0.4141414141414141 -0.3939393939393939 --0.3737373737373738 +-0.3737373737373737 -0.3535353535353535 --0.3333333333333333 +-0.3333333333333334 -0.3131313131313131 -0.2929292929292929 -0.2727272727272727 -0.2525252525252525 --0.2323232323232323 --0.2121212121212121 +-0.2323232323232324 +-0.2121212121212122 -0.1919191919191919 -0.1717171717171717 -0.1515151515151515 -0.1313131313131313 --0.1111111111111111 --0.09090909090909091 --0.0707070707070707 +-0.1111111111111112 +-0.09090909090909094 +-0.07070707070707072 -0.0505050505050505 --0.0303030303030303 --0.0101010101010101 -0.0101010101010101 -0.0303030303030303 -0.0505050505050505 -0.0707070707070707 -0.09090909090909091 -0.1111111111111111 +-0.03030303030303028 +-0.01010101010101006 +0.01010101010101017 +0.03030303030303028 +0.05050505050505061 +0.07070707070707072 +0.09090909090909083 +0.1111111111111112 0.1313131313131313 -0.1515151515151515 +0.1515151515151516 0.1717171717171717 -0.1919191919191919 -0.2121212121212121 +0.1919191919191918 +0.2121212121212122 0.2323232323232323 -0.2525252525252525 +0.2525252525252526 0.2727272727272727 -0.2929292929292929 +0.292929292929293 0.3131313131313131 0.3333333333333333 -0.3535353535353535 -0.3737373737373738 -0.3939393939393939 +0.3535353535353536 +0.3737373737373737 +0.393939393939394 0.4141414141414141 -0.4343434343434344 -0.4545454545454545 -0.4747474747474748 +0.4343434343434343 +0.4545454545454546 +0.4747474747474747 0.494949494949495 0.5151515151515151 -0.5353535353535354 +0.5353535353535352 0.5555555555555556 -0.5757575757575758 -0.5959595959595959 +0.5757575757575757 +0.595959595959596 0.6161616161616161 -0.6363636363636364 +0.6363636363636365 0.6565656565656566 -0.6767676767676768 +0.6767676767676767 0.696969696969697 0.7171717171717171 -0.7373737373737373 +0.7373737373737375 0.7575757575757576 -0.7777777777777778 +0.7777777777777777 0.797979797979798 -0.8181818181818182 -0.8383838383838383 +0.8181818181818181 +0.8383838383838385 0.8585858585858586 -0.8787878787878788 +0.8787878787878789 0.898989898989899 -0.9191919191919192 +0.9191919191919191 0.9393939393939394 0.9595959595959596 -0.9797979797979798 +0.9797979797979799 1 diff --git a/gold/gold_coefficients.m b/gold/gold_coefficients.m index f3ab9d76..9a611f4c 100644 --- a/gold/gold_coefficients.m +++ b/gold/gold_coefficients.m @@ -1,4 +1,12 @@ % uniform level + +%TODO: Debug: after update of the way PDE are implemented +% now it is not acceptable to call constructor without parameters +continuity1 +%Possible fix: update all PDE constructor with a default one. +% or change this file to build opts and give as parameter before +% calling PDE constructor. + levels = [3, 3]; generate_data( fokkerplanck2_complete, levels, 'fokkerplanck2_complete', 'deg', 3 ); levels = [4, 4]; @@ -16,9 +24,11 @@ levels = [3, 3]; generate_data( diffusion2, levels, 'diffusion2', 'deg', 5 ); levels = [4]; -generate_data( fokkerplanck1_pitch_E(1), levels, 'fokkerplanck1_4p1a', 'deg', 3 ); +generate_data( fokkerplanck1_pitch_E(1), levels, 'fokkerplanck1_pitch_E_case1', 'deg', 3 ); +levels = [4]; +generate_data( fokkerplanck1_pitch_E(2), levels, 'fokkerplanck1_pitch_E_case2', 'deg', 3 ); levels = [5]; -generate_data( fokkerplanck1_pitch_C, levels, 'fokkerplanck1_4p2', 'deg', 2 ); +generate_data( fokkerplanck1_pitch_C, levels, 'fokkerplanck1_pitch_C', 'deg', 2 ); levels = [2]; generate_data( fokkerplanck1_4p3, levels, 'fokkerplanck1_4p3', 'deg', 5 ); levels = [5]; diff --git a/gold/gold_hash_table.m b/gold/gold_hash_table.m index 89ee5737..fd933c1c 100644 --- a/gold/gold_hash_table.m +++ b/gold/gold_hash_table.m @@ -12,7 +12,7 @@ levels{1} = [7]; levels{2} = [5, 2]; levels{3} = [3, 2, 3]; -max_adapt_lev = 7; +max_adapt_lev = 8; out_format = strcat(data_dir, "table_%dd_%s.dat"); id_out_format = strcat(data_dir, "ids_%dd_%s.dat"); child_id_out_format = strcat(data_dir, "child_ids_%dd_%s.dat"); @@ -91,4 +91,4 @@ end -end \ No newline at end of file +end diff --git a/gold/gold_time_advance.m b/gold/gold_time_advance.m index 83c14350..7bfea218 100644 --- a/gold/gold_time_advance.m +++ b/gold/gold_time_advance.m @@ -8,10 +8,15 @@ %% adaptive time advance testing -out_format = strcat(data_dir,'fokkerplanck1_4p1a_ad_sg_l4_d4_t%d.dat'); +out_format = strcat(data_dir,'fokkerplanck1_pitch_E_case1_ad_sg_l4_d4_t%d.dat'); run_time_advance(@fokkerplanck1_pitch_E,out_format, ... 'CFL',0.01,'lev',4,'deg',4,'grid_type','SG','timestep_method','RK3', 'adapt', true, ... - 'adapt_initial_condition', true, 'adapt_threshold', 1e-4); + 'adapt_initial_condition', true, 'adapt_threshold', 1e-4,'case',1); + +out_format = strcat(data_dir,'fokkerplanck1_pitch_E_case2_ad_sg_l4_d4_t%d.dat'); +run_time_advance(@fokkerplanck1_pitch_E,out_format, ... + 'CFL',0.01,'lev',4,'deg',4,'grid_type','SG','timestep_method','RK3', 'adapt', true, ... + 'adapt_initial_condition', true, 'adapt_threshold', 1e-4,'case',2); out_format = strcat(data_dir,'continuity2_ad_sg_l3_d4_t%d.dat'); run_time_advance(@continuity2,out_format, ... @@ -102,23 +107,28 @@ run_time_advance(@continuity6,out_format, ... 'CFL',0.01,'lev',2,'deg',3,'grid_type','SG','timestep_method','RK3'); -% fokkerplanck1_4p2 sg l2d2 -out_format = strcat(data_dir,'fokkerplanck1_4p2_sg_l2_d2_t%d.dat'); +% fokkerplanck1_pitch_C sg l2d2 +out_format = strcat(data_dir,'fokkerplanck1_pitch_C_sg_l2_d2_t%d.dat'); run_time_advance(@fokkerplanck1_pitch_C,out_format, ... 'CFL',0.01,'lev',2,'deg',2,'grid_type','SG','timestep_method','RK3'); -% fokkerplanck1_4p2 fg l2d2 -out_format = strcat(data_dir,'fokkerplanck1_4p2_fg_l2_d2_t%d.dat'); +% fokkerplanck1_pitch_C fg l2d2 +out_format = strcat(data_dir,'fokkerplanck1_pitch_C_fg_l2_d2_t%d.dat'); run_time_advance(@fokkerplanck1_pitch_C,out_format, ... 'CFL',0.01,'lev',2,'deg',2,'grid_type','FG','timestep_method','RK3'); -% fokkerplanck1_4p1a sg l2d2 -out_format = strcat(data_dir,'fokkerplanck1_4p1a_sg_l2_d2_t%d.dat'); +% fokkerplanck1_pitch_E_case1 sg l2d2 +out_format = strcat(data_dir,'fokkerplanck1_pitch_E_case1_sg_l2_d2_t%d.dat'); run_time_advance(@fokkerplanck1_pitch_E,out_format, ... - 'CFL',0.01,'lev',2,'deg',2,'grid_type','SG','timestep_method','RK3'); +'CFL',0.01,'lev',2,'deg',2,'grid_type','SG','timestep_method','RK3','case',1); + +% fokkerplanck1_pitch_E_case2 sg l2d2 +out_format = strcat(data_dir,'fokkerplanck1_pitch_E_case2_sg_l2_d2_t%d.dat'); +run_time_advance(@fokkerplanck1_pitch_E,out_format, ... +'CFL',0.01,'lev',2,'deg',2,'grid_type','SG','timestep_method','RK3','case',2); -%fokkerplanck1_4p3 sg l2d2 -out_format = strcat(data_dir,'fokkerplanck1_4p3_sg_l2_d2_t%d.dat'); +%fokkerplanck1_pitch_R sg l2d2 +out_format = strcat(data_dir,'fokkerplanck1_pitch_R_sg_l2_d2_t%d.dat'); run_time_advance(@fokkerplanck1_pitch_R,out_format, ... 'CFL',0.01,'lev',2,'deg',2,'grid_type','SG','timestep_method','RK3'); diff --git a/gold/make_all_gold.m b/gold/make_all_gold.m index 2cf2790f..c62a9086 100644 --- a/gold/make_all_gold.m +++ b/gold/make_all_gold.m @@ -1,23 +1,23 @@ close all clear all -disp('Generating gold data for permute component'); -gold_permute - -disp('Generating gold data for connectivity component'); -gold_connect - -disp('Generating gold data for hash table component'); -gold_hash_table - -disp('Generating gold data for matlab component'); -gold_matlab - -disp('Generating gold data for quadrature component'); -gold_quadrature - -disp('Generating gold data for transformations component'); -gold_transformations +%disp('Generating gold data for permute component'); +%gold_permute +% +%disp('Generating gold data for connectivity component'); +%gold_connect +% +%disp('Generating gold data for hash table component'); +%gold_hash_table +% +%disp('Generating gold data for matlab component'); +%gold_matlab +% +%disp('Generating gold data for quadrature component'); +%gold_quadrature +% +%disp('Generating gold data for transformations component'); +%gold_transformations % needs fixing % disp('Generating gold data for pde component');