diff --git a/example/IO/cmesh/gmsh/circlesquare_hybrid_hole.msh b/example/IO/cmesh/gmsh/circlesquare_hybrid_hole.msh index c19ccbb6a2..91d202dad0 100644 --- a/example/IO/cmesh/gmsh/circlesquare_hybrid_hole.msh +++ b/example/IO/cmesh/gmsh/circlesquare_hybrid_hole.msh @@ -1,474 +1,828 @@ $MeshFormat -2.2 0 8 +4.1 0 8 $EndMeshFormat +$Entities +22 33 12 0 +1 0 0 0 0 +2 1 0 0 0 +3 0 1 0 0 +4 -1 0 0 0 +5 0 -1 0 0 +13 -1.5 -1.5 0 0 +14 1.5 -1.5 0 0 +15 1.5 1.5 0 0 +16 -1.5 1.5 0 0 +17 0 1.5 0 0 +18 1.5 0 0 0 +19 0 -1.5 0 0 +20 -1.5 0 0 0 +21 -2 2 0 0 +22 -2 -2 0 0 +23 -2 0 0 0 +29 -2 -1.5 0 0 +30 2 0 -5.551115123125783e-16 0 +31 2 -2 -5.551115123125783e-16 0 +32 8.881784197001252e-16 2 -5.551115123125783e-16 0 +33 2 1.999999999999999 -5.551115123125783e-16 0 +55 0 -2 0 0 +1 0 0 0 1 1 0 0 0 +2 -1 0 0 0 1 0 0 0 +3 -1 -1 0 0 0 0 0 0 +4 0 -1 0 1 0 0 0 0 +21 0 1 0 0 1.5 0 0 0 +22 1 0 0 1.5 0 0 0 0 +23 0 -1.5 0 0 -1 0 0 0 +24 -1.5 0 0 -1 0 0 0 0 +25 -1.5 -1.5 0 0 -1.5 0 0 0 +27 0 -1.5 0 1.5 -1.5 0 0 0 +28 1.5 -1.5 0 1.5 0 0 0 0 +29 1.5 0 0 1.5 1.5 0 0 0 +30 0 1.5 0 1.5 1.5 0 0 0 +31 -1.5 1.5 0 0 1.5 0 0 0 +32 -1.5 0 0 -1.5 1.5 0 0 0 +33 -1.5 -1.5 0 -1.5 0 0 0 0 +45 -2 1.5 0 -1.5 2 0 0 0 +46 -2 -2 0 -1.5 -1.5 0 0 0 +50 -2 0 0 -1.5 0 0 0 0 +51 -2 0 0 -2 2 0 0 0 +54 -2 -2 0 -2 0 0 0 0 +60 -2 -1.5 0 -2 0 0 0 0 +62 2 -2 -5.551115123125783e-16 2 0 -5.551115123125783e-16 0 0 +63 1.5 -2 -5.551115123125783e-16 2 -1.5 0 0 0 +65 1.5 0 -5.551115123125783e-16 2 0 0 0 0 +67 8.881784197001252e-16 1.999999999999999 -5.551115123125783e-16 2 2 -5.551115123125783e-16 0 0 +68 1.5 1.5 -5.551115123125783e-16 2 1.999999999999999 0 0 0 +70 0 1.5 -5.551115123125783e-16 8.881784197001252e-16 2 0 0 0 +77 2 0 -5.551115123125783e-16 2 1.999999999999999 -5.551115123125783e-16 0 0 +79 -2 2 -5.551115123125783e-16 8.881784197001252e-16 2 0 0 0 +94 0 -2 0 0 -1.5 0 0 0 +95 0 -2 -5.551115123125783e-16 2 -2 0 0 0 +96 -2 -2 0 0 -2 0 0 0 +53 -2 0 0 -1.5 2 0 0 0 +56 -2 -2 0 -1.5 0 0 0 0 +61 1.5 -2 -5.551115123125783e-16 2 0 0 0 0 +66 0 1.5 -5.551115123125783e-16 2 2 0 0 0 +76 1.5 0 -5.551115123125783e-16 2 1.999999999999999 0 0 0 +78 -2 1.5 -5.551115123125783e-16 8.881784197001252e-16 2 0 0 0 +100 0 -2 -5.551115123125783e-16 2 -1.5 4.62592926934857e-17 0 0 +101 -2 -2 0 0 -1.5 0 0 0 +102 -1.5 0 0 0 1.5 0 0 0 +103 0 0 0 1.5 1.5 0 0 0 +104 0 -1.5 0 1.5 0 0 0 0 +105 -1.5 -1.5 0 0 0 0 0 0 +$EndEntities $Nodes +67 150 1 150 +0 1 0 1 +1 +0 0 0 +0 2 0 1 +2 +1 0 0 +0 3 0 1 +3 +0 1 0 +0 4 0 1 +4 +-1 0 0 +0 5 0 1 +5 +0 -1 0 +0 13 0 1 +6 +-1.5 -1.5 0 +0 14 0 1 +7 +1.5 -1.5 0 +0 15 0 1 +8 +1.5 1.5 0 +0 16 0 1 +9 +-1.5 1.5 0 +0 17 0 1 +10 +0 1.5 0 +0 18 0 1 +11 +1.5 0 0 +0 19 0 1 +12 +0 -1.5 0 +0 20 0 1 +13 +-1.5 0 0 +0 21 0 1 +14 +-2 2 0 +0 22 0 1 +15 +-2 -2 0 +0 23 0 1 +16 +-2 0 0 +0 29 0 1 +17 +-2 -1.5 0 +0 30 0 1 +18 +2 0 -5.551115123125783e-16 +0 31 0 1 +19 +2 -2 -5.551115123125783e-16 +0 32 0 1 +20 +8.881784197001252e-16 2 -5.551115123125783e-16 +0 33 0 1 +21 +2 1.999999999999999 -5.551115123125783e-16 +0 55 0 1 +22 +0 -2 0 +1 1 0 6 +23 +24 +25 +26 +27 +28 +0.9749279121819562 0.2225209339557337 0 +0.9009688679029272 0.4338837391165031 0 +0.781831482469095 0.6234898018573979 0 +0.6234898018599706 0.7818314824670433 0 +0.4338837391184384 0.9009688679019952 0 +0.2225209339566753 0.9749279121817412 0 +1 2 0 6 +29 +30 +31 +32 +33 +34 +-0.2225209339557337 0.9749279121819562 0 +-0.4338837391165031 0.9009688679029272 0 +-0.6234898018573979 0.781831482469095 0 +-0.7818314824670433 0.6234898018599706 0 +-0.9009688679019952 0.4338837391184384 0 +-0.9749279121817412 0.2225209339566753 0 +1 3 0 6 +35 +36 +37 +38 +39 +40 +-0.9749279121819562 -0.2225209339557337 0 +-0.9009688679029272 -0.4338837391165031 0 +-0.781831482469095 -0.6234898018573979 0 +-0.6234898018599706 -0.7818314824670433 0 +-0.4338837391184384 -0.9009688679019952 0 +-0.2225209339566753 -0.9749279121817412 0 +1 4 0 6 +41 +42 +43 +44 +45 +46 +0.2225209339557337 -0.9749279121819562 0 +0.4338837391165031 -0.9009688679029272 0 +0.6234898018573979 -0.781831482469095 0 +0.7818314824670433 -0.6234898018599706 0 +0.9009688679019952 -0.4338837391184384 0 +0.9749279121817412 -0.2225209339566753 0 +1 21 0 1 +47 +0 1.287596162878356 0 +1 22 0 1 +48 +1.287596162878356 0 0 +1 23 0 1 +49 +0 -1.287596162878356 0 +1 24 0 1 +50 +-1.287596162878356 0 0 +1 25 0 1 +51 +-0.750000000002081 -1.5 0 +1 27 0 1 +52 +0.749999999997143 -1.5 0 +1 28 0 1 +53 +1.5 -0.750000000002081 0 +1 29 0 1 +54 +1.5 0.749999999997143 0 +1 30 0 1 +55 +0.750000000002081 1.5 0 +1 31 0 1 +56 +-0.749999999997143 1.5 0 +1 32 0 1 +57 +-1.5 0.750000000002081 0 +1 33 0 1 +58 +-1.5 -0.749999999997143 0 +1 45 0 2 +59 +60 +-1.666666666666667 1.666666666666667 0 +-1.833333333333333 1.833333333333333 0 +1 46 0 2 +61 +62 +-1.666666666666667 -1.666666666666667 0 +-1.833333333333333 -1.833333333333333 0 +1 50 0 2 +63 +64 +-1.666666666666667 0 0 +-1.833333333333333 0 0 +1 51 0 1 +65 +-2 1.000000000004119 0 +1 54 0 1 +66 +-2 -0.9999999999973842 0 +1 60 0 4 +67 +68 +69 +70 +-2 -1.200000000001501 0 +-2 -0.9000000000014141 0 +-2 -0.6000000000016827 0 +-2 -0.3000000000008414 0 +1 62 0 1 +71 +2 -0.9999999999973842 -5.551115123125783e-16 +1 63 0 2 +72 +73 +1.833333333333333 -1.833333333333333 -3.700743415417188e-16 +1.666666666666667 -1.666666666666667 -1.850371707708594e-16 +1 65 0 2 +74 +75 +1.666666666666667 0 -1.850371707708594e-16 +1.833333333333333 0 -3.700743415417188e-16 +1 67 0 1 +76 +0.9999999999973797 2 -5.551115123125783e-16 +1 68 0 2 +77 +78 +1.833333333333463 1.833333333333463 -3.700743415418633e-16 +1.666666666666804 1.666666666666804 -1.850371707710122e-16 +1 70 0 2 +79 +80 +2.960594732333751e-16 1.666666666666667 -1.850371707708594e-16 +5.921189464667501e-16 1.833333333333333 -3.700743415417188e-16 +1 77 0 1 +81 +2 0.9999999999974049 -5.551115123125783e-16 +1 79 0 1 +82 +-0.9999999999973951 2 -2.77555756157012e-16 +1 94 0 2 +83 +84 +0 -1.833333333333333 0 +0 -1.666666666666667 0 +1 95 0 1 +85 +0.9999999999973842 -2 -2.775557561555631e-16 +1 96 0 1 +86 +-0.9999999999973842 -2 0 +2 53 0 2 +87 +88 +-1.833333333333334 0.9166666666701063 0 +-1.666666666666667 0.8333333333360935 0 +2 56 0 2 +89 +90 +-1.833333333333333 -0.9166666666639703 0 +-1.666666666666666 -0.8333333333305568 0 +2 61 0 2 +91 +92 +1.833333333333333 -0.9166666666656165 -3.700743415417185e-16 +1.666666666666667 -0.8333333333338486 -1.850371707708594e-16 +2 66 0 2 +93 +94 +0.9166666666656784 1.833333333333398 -3.700743415417913e-16 +0.8333333333339159 1.666666666666735 -1.850371707709357e-16 +2 76 0 2 +95 +96 +1.833333333333399 0.9166666666640492 -3.700743415417915e-16 +1.666666666666735 0.8333333333306322 -1.850371707709359e-16 +2 78 0 2 +97 +98 +-0.9166666666639779 1.833333333333333 -2.544261098106778e-16 +-0.8333333333305604 1.666666666666666 -2.312964634643436e-16 +2 100 0 2 +99 +100 +0.9166666666639702 -1.833333333333333 -1.156482317310381e-16 +0.8333333333305566 -1.666666666666667 4.62592926934857e-17 +2 101 0 2 +101 +102 +-0.8333333333338488 -1.666666666666666 0 +-0.9166666666656166 -1.833333333333332 0 +2 102 0 12 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +-1.079695770484813 1.079695770486938 0 +-1.257403499403368 0.4338022313238283 0 +-0.4338022313215111 1.257403499403623 0 +-0.6557124295327068 1.073315154893261 0 +-1.073315154892134 0.6557124295354007 0 +-0.2055038829670173 1.1712867015515 0 +-1.171286701551483 0.2055038829680291 0 +-0.8428089278468189 0.842808927848933 0 +-1.343257272766642 0.2778612228587877 0 +-0.2778612228571342 1.343257272766696 0 +-1.075580427186144 0.3902846433804745 0 +-0.3902846433786944 1.075580427186653 0 +2 103 0 12 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +1.079695770486938 1.079695770484813 0 +0.4338022313238284 1.257403499403369 0 +1.257403499403623 0.4338022313215111 0 +1.073315154893261 0.6557124295327068 0 +0.6557124295354007 1.073315154892134 0 +1.1712867015515 0.2055038829670173 0 +0.2055038829680292 1.171286701551483 0 +0.842808927848933 0.8428089278468192 0 +0.2778612228587877 1.343257272766641 0 +1.343257272766696 0.2778612228571342 0 +0.3902846433804744 1.075580427186144 0 +1.075580427186653 0.3902846433786944 0 +2 104 0 12 +127 +128 +129 +130 +131 +132 +133 +134 +135 +136 +137 +138 +1.079695770484813 -1.079695770486938 0 +1.257403499403369 -0.4338022313238284 0 +0.4338022313215111 -1.257403499403623 0 +0.6557124295327068 -1.073315154893261 0 +1.073315154892134 -0.6557124295354008 0 +0.2055038829670173 -1.1712867015515 0 +1.171286701551483 -0.2055038829680292 0 +0.8428089278468192 -0.8428089278489331 0 +1.343257272766642 -0.2778612228587877 0 +0.2778612228571343 -1.343257272766696 0 +1.075580427186144 -0.3902846433804744 0 +0.3902846433786944 -1.075580427186653 0 +2 105 0 12 +139 +140 +141 +142 +143 +144 +145 +146 +147 +148 +149 150 -1 0 0 0 -2 1 0 0 -3 0 1 0 -4 -1 0 0 -5 0 -1 0 -6 -1.5 -1.5 0 -7 1.5 -1.5 0 -8 1.5 1.5 0 -9 -1.5 1.5 0 -10 0 1.5 0 -11 1.5 0 0 -12 0 -1.5 0 -13 -1.5 0 0 -14 -2 2 0 -15 -2 -2 0 -16 -2 0 0 -17 -2 -1.5 0 -18 2 0 -5.551115123125783e-16 -19 2 -2 -5.551115123125783e-16 -20 8.881784197001252e-16 2 -5.551115123125783e-16 -21 2 1.999999999999999 -5.551115123125783e-16 -22 0 -2 0 -23 0.9749279121819562 0.2225209339557337 0 -24 0.9009688679029272 0.4338837391165031 0 -25 0.781831482469095 0.6234898018573979 0 -26 0.6234898018599706 0.7818314824670433 0 -27 0.4338837391184384 0.9009688679019952 0 -28 0.2225209339566753 0.9749279121817412 0 -29 -0.2225209339557337 0.9749279121819562 0 -30 -0.4338837391165031 0.9009688679029272 0 -31 -0.6234898018573979 0.781831482469095 0 -32 -0.7818314824670433 0.6234898018599706 0 -33 -0.9009688679019952 0.4338837391184384 0 -34 -0.9749279121817412 0.2225209339566753 0 -35 -0.9749279121819562 -0.2225209339557337 0 -36 -0.9009688679029272 -0.4338837391165031 0 -37 -0.781831482469095 -0.6234898018573979 0 -38 -0.6234898018599706 -0.7818314824670433 0 -39 -0.4338837391184384 -0.9009688679019952 0 -40 -0.2225209339566753 -0.9749279121817412 0 -41 0.2225209339557337 -0.9749279121819562 0 -42 0.4338837391165031 -0.9009688679029272 0 -43 0.6234898018573979 -0.781831482469095 0 -44 0.7818314824670433 -0.6234898018599706 0 -45 0.9009688679019952 -0.4338837391184384 0 -46 0.9749279121817412 -0.2225209339566753 0 -47 0 1.287596162878356 0 -48 1.287596162878356 0 0 -49 0 -1.287596162878356 0 -50 -1.287596162878356 0 0 -51 -0.750000000002081 -1.5 0 -52 0.749999999997143 -1.5 0 -53 1.5 -0.750000000002081 0 -54 1.5 0.749999999997143 0 -55 0.750000000002081 1.5 0 -56 -0.749999999997143 1.5 0 -57 -1.5 0.750000000002081 0 -58 -1.5 -0.749999999997143 0 -59 -1.666666666666667 1.666666666666667 0 -60 -1.833333333333333 1.833333333333333 0 -61 -1.666666666666667 -1.666666666666667 0 -62 -1.833333333333333 -1.833333333333333 0 -63 -1.666666666666667 0 0 -64 -1.833333333333333 0 0 -65 -2 1.000000000004119 0 -66 -2 -0.9999999999973842 0 -67 -2 -1.200000000001501 0 -68 -2 -0.9000000000014141 0 -69 -2 -0.6000000000016827 0 -70 -2 -0.3000000000008414 0 -71 2 -0.9999999999973842 -5.551115123125783e-16 -72 1.833333333333333 -1.833333333333333 -3.700743415417188e-16 -73 1.666666666666667 -1.666666666666667 -1.850371707708594e-16 -74 1.666666666666667 0 -1.850371707708594e-16 -75 1.833333333333333 0 -3.700743415417188e-16 -76 0.9999999999973797 2 -5.551115123125783e-16 -77 1.833333333333463 1.833333333333463 -3.700743415418633e-16 -78 1.666666666666804 1.666666666666804 -1.850371707710122e-16 -79 2.960594732333751e-16 1.666666666666667 -1.850371707708594e-16 -80 5.921189464667501e-16 1.833333333333333 -3.700743415417188e-16 -81 2 0.9999999999974049 -5.551115123125783e-16 -82 -0.9999999999973951 2 -2.77555756157012e-16 -83 0 -1.833333333333333 0 -84 0 -1.666666666666667 0 -85 0.9999999999973842 -2 -2.775557561555631e-16 -86 -0.9999999999973842 -2 0 -87 -1.833333333333334 0.9166666666701063 0 -88 -1.666666666666667 0.8333333333360935 0 -89 -1.833333333333333 -0.9166666666639703 0 -90 -1.666666666666666 -0.8333333333305568 0 -91 1.833333333333333 -0.9166666666656165 -3.700743415417185e-16 -92 1.666666666666667 -0.8333333333338486 -1.850371707708594e-16 -93 0.9166666666656784 1.833333333333398 -3.700743415417913e-16 -94 0.8333333333339159 1.666666666666735 -1.850371707709357e-16 -95 1.833333333333399 0.9166666666640492 -3.700743415417915e-16 -96 1.666666666666735 0.8333333333306322 -1.850371707709359e-16 -97 -0.9166666666639779 1.833333333333333 -2.544261098106778e-16 -98 -0.8333333333305604 1.666666666666666 -2.312964634643436e-16 -99 0.9166666666639702 -1.833333333333333 -1.156482317310381e-16 -100 0.8333333333305566 -1.666666666666667 4.62592926934857e-17 -101 -0.8333333333338488 -1.666666666666666 0 -102 -0.9166666666656166 -1.833333333333332 0 -103 -1.079695770484813 1.079695770486938 0 -104 -1.257403499403368 0.4338022313238283 0 -105 -0.4338022313215111 1.257403499403623 0 -106 -0.6557124295327068 1.073315154893261 0 -107 -1.073315154892134 0.6557124295354007 0 -108 -0.2055038829670173 1.1712867015515 0 -109 -1.171286701551483 0.2055038829680291 0 -110 -0.8428089278468189 0.842808927848933 0 -111 -1.343257272766642 0.2778612228587877 0 -112 -0.2778612228571342 1.343257272766696 0 -113 -1.075580427186144 0.3902846433804745 0 -114 -0.3902846433786944 1.075580427186653 0 -115 1.079695770486938 1.079695770484813 0 -116 0.4338022313238284 1.257403499403369 0 -117 1.257403499403623 0.4338022313215111 0 -118 1.073315154893261 0.6557124295327068 0 -119 0.6557124295354007 1.073315154892134 0 -120 1.1712867015515 0.2055038829670173 0 -121 0.2055038829680292 1.171286701551483 0 -122 0.842808927848933 0.8428089278468192 0 -123 0.2778612228587877 1.343257272766641 0 -124 1.343257272766696 0.2778612228571342 0 -125 0.3902846433804744 1.075580427186144 0 -126 1.075580427186653 0.3902846433786944 0 -127 1.079695770484813 -1.079695770486938 0 -128 1.257403499403369 -0.4338022313238284 0 -129 0.4338022313215111 -1.257403499403623 0 -130 0.6557124295327068 -1.073315154893261 0 -131 1.073315154892134 -0.6557124295354008 0 -132 0.2055038829670173 -1.1712867015515 0 -133 1.171286701551483 -0.2055038829680292 0 -134 0.8428089278468192 -0.8428089278489331 0 -135 1.343257272766642 -0.2778612228587877 0 -136 0.2778612228571343 -1.343257272766696 0 -137 1.075580427186144 -0.3902846433804744 0 -138 0.3902846433786944 -1.075580427186653 0 -139 -1.079695770486938 -1.079695770484813 0 -140 -0.4338022313238284 -1.257403499403369 0 -141 -1.257403499403623 -0.433802231321511 0 -142 -1.073315154893261 -0.6557124295327068 0 -143 -0.6557124295354007 -1.073315154892134 0 -144 -1.1712867015515 -0.2055038829670173 0 -145 -0.2055038829680292 -1.171286701551483 0 -146 -0.8428089278489331 -0.8428089278468189 0 -147 -0.2778612228587877 -1.343257272766642 0 -148 -1.343257272766696 -0.2778612228571342 0 -149 -0.3902846433804744 -1.075580427186144 0 -150 -1.075580427186653 -0.3902846433786943 0 +-1.079695770486938 -1.079695770484813 0 +-0.4338022313238284 -1.257403499403369 0 +-1.257403499403623 -0.433802231321511 0 +-1.073315154893261 -0.6557124295327068 0 +-0.6557124295354007 -1.073315154892134 0 +-1.1712867015515 -0.2055038829670173 0 +-0.2055038829680292 -1.171286701551483 0 +-0.8428089278489331 -0.8428089278468189 0 +-0.2778612228587877 -1.343257272766642 0 +-1.343257272766696 -0.2778612228571342 0 +-0.3902846433804744 -1.075580427186144 0 +-1.075580427186653 -0.3902846433786943 0 $EndNodes $Elements -315 -1 15 2 0 1 1 -2 15 2 0 2 2 -3 15 2 0 3 3 -4 15 2 0 4 4 -5 15 2 0 5 5 -6 15 2 0 13 6 -7 15 2 0 14 7 -8 15 2 0 15 8 -9 15 2 0 16 9 -10 15 2 0 17 10 -11 15 2 0 18 11 -12 15 2 0 19 12 -13 15 2 0 20 13 -14 15 2 0 21 14 -15 15 2 0 22 15 -16 15 2 0 23 16 -17 15 2 0 29 17 -18 15 2 0 30 18 -19 15 2 0 31 19 -20 15 2 0 32 20 -21 15 2 0 33 21 -22 15 2 0 55 22 -23 1 2 0 1 2 23 -24 1 2 0 1 23 24 -25 1 2 0 1 24 25 -26 1 2 0 1 25 26 -27 1 2 0 1 26 27 -28 1 2 0 1 27 28 -29 1 2 0 1 28 3 -30 1 2 0 2 3 29 -31 1 2 0 2 29 30 -32 1 2 0 2 30 31 -33 1 2 0 2 31 32 -34 1 2 0 2 32 33 -35 1 2 0 2 33 34 -36 1 2 0 2 34 4 -37 1 2 0 3 4 35 -38 1 2 0 3 35 36 -39 1 2 0 3 36 37 -40 1 2 0 3 37 38 -41 1 2 0 3 38 39 -42 1 2 0 3 39 40 -43 1 2 0 3 40 5 -44 1 2 0 4 5 41 -45 1 2 0 4 41 42 -46 1 2 0 4 42 43 -47 1 2 0 4 43 44 -48 1 2 0 4 44 45 -49 1 2 0 4 45 46 -50 1 2 0 4 46 2 -51 1 2 0 21 3 47 -52 1 2 0 21 47 10 -53 1 2 0 22 2 48 -54 1 2 0 22 48 11 -55 1 2 0 23 5 49 -56 1 2 0 23 49 12 -57 1 2 0 24 4 50 -58 1 2 0 24 50 13 -59 1 2 0 25 6 51 -60 1 2 0 25 51 12 -61 1 2 0 27 12 52 -62 1 2 0 27 52 7 -63 1 2 0 28 7 53 -64 1 2 0 28 53 11 -65 1 2 0 29 11 54 -66 1 2 0 29 54 8 -67 1 2 0 30 8 55 -68 1 2 0 30 55 10 -69 1 2 0 31 10 56 -70 1 2 0 31 56 9 -71 1 2 0 32 9 57 -72 1 2 0 32 57 13 -73 1 2 0 33 13 58 -74 1 2 0 33 58 6 -75 1 2 0 45 9 59 -76 1 2 0 45 59 60 -77 1 2 0 45 60 14 -78 1 2 0 46 6 61 -79 1 2 0 46 61 62 -80 1 2 0 46 62 15 -81 1 2 0 50 13 63 -82 1 2 0 50 63 64 -83 1 2 0 50 64 16 -84 1 2 0 51 14 65 -85 1 2 0 51 65 16 -86 1 2 0 54 16 66 -87 1 2 0 54 66 15 -88 1 2 0 60 17 67 -89 1 2 0 60 67 68 -90 1 2 0 60 68 69 -91 1 2 0 60 69 70 -92 1 2 0 60 70 16 -93 1 2 0 62 18 71 -94 1 2 0 62 71 19 -95 1 2 0 63 19 72 -96 1 2 0 63 72 73 -97 1 2 0 63 73 7 -98 1 2 0 65 11 74 -99 1 2 0 65 74 75 -100 1 2 0 65 75 18 -101 1 2 0 67 20 76 -102 1 2 0 67 76 21 -103 1 2 0 68 21 77 -104 1 2 0 68 77 78 -105 1 2 0 68 78 8 -106 1 2 0 70 10 79 -107 1 2 0 70 79 80 -108 1 2 0 70 80 20 -109 1 2 0 77 18 81 -110 1 2 0 77 81 21 -111 1 2 0 79 20 82 -112 1 2 0 79 82 14 -113 1 2 0 94 22 83 -114 1 2 0 94 83 84 -115 1 2 0 94 84 12 -116 1 2 0 95 22 85 -117 1 2 0 95 85 19 -118 1 2 0 96 22 86 -119 1 2 0 96 86 15 -120 2 2 0 102 3 108 47 -121 2 2 0 102 4 50 109 -122 2 2 0 102 30 31 106 -123 2 2 0 102 32 33 107 -124 2 2 0 102 9 56 103 -125 2 2 0 102 9 103 57 -126 2 2 0 102 30 106 114 -127 2 2 0 102 33 113 107 -128 2 2 0 102 3 29 108 -129 2 2 0 102 4 109 34 -130 2 2 0 102 31 32 110 -131 2 2 0 102 47 108 112 -132 2 2 0 102 50 111 109 -133 2 2 0 102 34 109 113 -134 2 2 0 102 29 114 108 -135 2 2 0 102 32 107 110 -136 2 2 0 102 31 110 106 -137 2 2 0 102 13 111 50 -138 2 2 0 102 10 47 112 -139 2 2 0 102 104 109 111 -140 2 2 0 102 105 112 108 -141 2 2 0 102 104 113 109 -142 2 2 0 102 105 108 114 -143 2 2 0 102 33 34 113 -144 2 2 0 102 29 30 114 -145 2 2 0 102 104 107 113 -146 2 2 0 102 105 114 106 -147 2 2 0 102 57 103 107 -148 2 2 0 102 56 106 103 -149 2 2 0 102 57 107 104 -150 2 2 0 102 56 105 106 -151 2 2 0 102 103 110 107 -152 2 2 0 102 103 106 110 -153 2 2 0 102 10 112 56 -154 2 2 0 102 13 57 111 -155 2 2 0 102 56 112 105 -156 2 2 0 102 57 104 111 -157 2 2 0 103 2 120 48 -158 2 2 0 103 3 47 121 -159 2 2 0 103 24 25 118 -160 2 2 0 103 26 27 119 -161 2 2 0 103 8 54 115 -162 2 2 0 103 8 115 55 -163 2 2 0 103 24 118 126 -164 2 2 0 103 27 125 119 -165 2 2 0 103 2 23 120 -166 2 2 0 103 3 121 28 -167 2 2 0 103 25 26 122 -168 2 2 0 103 48 120 124 -169 2 2 0 103 47 123 121 -170 2 2 0 103 28 121 125 -171 2 2 0 103 23 126 120 -172 2 2 0 103 26 119 122 -173 2 2 0 103 25 122 118 -174 2 2 0 103 10 123 47 -175 2 2 0 103 11 48 124 -176 2 2 0 103 116 121 123 -177 2 2 0 103 117 124 120 -178 2 2 0 103 116 125 121 -179 2 2 0 103 117 120 126 -180 2 2 0 103 27 28 125 -181 2 2 0 103 23 24 126 -182 2 2 0 103 116 119 125 -183 2 2 0 103 117 126 118 -184 2 2 0 103 55 115 119 -185 2 2 0 103 54 118 115 -186 2 2 0 103 55 119 116 -187 2 2 0 103 54 117 118 -188 2 2 0 103 115 122 119 -189 2 2 0 103 115 118 122 -190 2 2 0 103 10 55 123 -191 2 2 0 103 11 124 54 -192 2 2 0 103 54 124 117 -193 2 2 0 103 55 116 123 -194 2 2 0 104 5 132 49 -195 2 2 0 104 2 48 133 -196 2 2 0 104 42 43 130 -197 2 2 0 104 44 45 131 -198 2 2 0 104 7 52 127 -199 2 2 0 104 7 127 53 -200 2 2 0 104 42 130 138 -201 2 2 0 104 45 137 131 -202 2 2 0 104 5 41 132 -203 2 2 0 104 2 133 46 -204 2 2 0 104 43 44 134 -205 2 2 0 104 49 132 136 -206 2 2 0 104 48 135 133 -207 2 2 0 104 46 133 137 -208 2 2 0 104 41 138 132 -209 2 2 0 104 44 131 134 -210 2 2 0 104 43 134 130 -211 2 2 0 104 11 135 48 -212 2 2 0 104 12 49 136 -213 2 2 0 104 128 133 135 -214 2 2 0 104 129 136 132 -215 2 2 0 104 128 137 133 -216 2 2 0 104 129 132 138 -217 2 2 0 104 45 46 137 -218 2 2 0 104 41 42 138 -219 2 2 0 104 128 131 137 -220 2 2 0 104 129 138 130 -221 2 2 0 104 53 127 131 -222 2 2 0 104 52 130 127 -223 2 2 0 104 53 131 128 -224 2 2 0 104 52 129 130 -225 2 2 0 104 127 134 131 -226 2 2 0 104 127 130 134 -227 2 2 0 104 11 53 135 -228 2 2 0 104 12 136 52 -229 2 2 0 104 52 136 129 -230 2 2 0 104 53 128 135 -231 2 2 0 105 4 144 50 -232 2 2 0 105 5 49 145 -233 2 2 0 105 36 37 142 -234 2 2 0 105 38 39 143 -235 2 2 0 105 6 58 139 -236 2 2 0 105 6 139 51 -237 2 2 0 105 36 142 150 -238 2 2 0 105 39 149 143 -239 2 2 0 105 4 35 144 -240 2 2 0 105 5 145 40 -241 2 2 0 105 37 38 146 -242 2 2 0 105 50 144 148 -243 2 2 0 105 49 147 145 -244 2 2 0 105 40 145 149 -245 2 2 0 105 35 150 144 -246 2 2 0 105 38 143 146 -247 2 2 0 105 37 146 142 -248 2 2 0 105 12 147 49 -249 2 2 0 105 13 50 148 -250 2 2 0 105 140 145 147 -251 2 2 0 105 141 148 144 -252 2 2 0 105 140 149 145 -253 2 2 0 105 141 144 150 -254 2 2 0 105 39 40 149 -255 2 2 0 105 35 36 150 -256 2 2 0 105 140 143 149 -257 2 2 0 105 141 150 142 -258 2 2 0 105 51 139 143 -259 2 2 0 105 58 142 139 -260 2 2 0 105 51 143 140 -261 2 2 0 105 58 141 142 -262 2 2 0 105 139 146 143 -263 2 2 0 105 139 142 146 -264 2 2 0 105 12 51 147 -265 2 2 0 105 13 148 58 -266 2 2 0 105 51 140 147 -267 2 2 0 105 58 148 141 -268 3 2 0 53 14 65 87 60 -269 3 2 0 53 60 87 88 59 -270 3 2 0 53 59 88 57 9 -271 3 2 0 53 65 16 64 87 -272 3 2 0 53 87 64 63 88 -273 3 2 0 53 88 63 13 57 -274 3 2 0 56 16 66 89 64 -275 3 2 0 56 64 89 90 63 -276 3 2 0 56 63 90 58 13 -277 3 2 0 56 66 15 62 89 -278 3 2 0 56 89 62 61 90 -279 3 2 0 56 90 61 6 58 -280 3 2 0 61 18 71 91 75 -281 3 2 0 61 75 91 92 74 -282 3 2 0 61 74 92 53 11 -283 3 2 0 61 71 19 72 91 -284 3 2 0 61 91 72 73 92 -285 3 2 0 61 92 73 7 53 -286 3 2 0 66 20 76 93 80 -287 3 2 0 66 80 93 94 79 -288 3 2 0 66 79 94 55 10 -289 3 2 0 66 76 21 77 93 -290 3 2 0 66 93 77 78 94 -291 3 2 0 66 94 78 8 55 -292 3 2 0 76 18 81 95 75 -293 3 2 0 76 75 95 96 74 -294 3 2 0 76 74 96 54 11 -295 3 2 0 76 81 21 77 95 -296 3 2 0 76 95 77 78 96 -297 3 2 0 76 96 78 8 54 -298 3 2 0 78 20 82 97 80 -299 3 2 0 78 80 97 98 79 -300 3 2 0 78 79 98 56 10 -301 3 2 0 78 82 14 60 97 -302 3 2 0 78 97 60 59 98 -303 3 2 0 78 98 59 9 56 -304 3 2 0 100 22 85 99 83 -305 3 2 0 100 83 99 100 84 -306 3 2 0 100 84 100 52 12 -307 3 2 0 100 85 19 72 99 -308 3 2 0 100 99 72 73 100 -309 3 2 0 100 100 73 7 52 -310 3 2 0 101 6 61 101 51 -311 3 2 0 101 51 101 84 12 -312 3 2 0 101 61 62 102 101 -313 3 2 0 101 101 102 83 84 -314 3 2 0 101 62 15 86 102 -315 3 2 0 101 102 86 22 83 +67 315 1 315 +0 1 15 1 +1 1 +0 2 15 1 +2 2 +0 3 15 1 +3 3 +0 4 15 1 +4 4 +0 5 15 1 +5 5 +0 13 15 1 +6 6 +0 14 15 1 +7 7 +0 15 15 1 +8 8 +0 16 15 1 +9 9 +0 17 15 1 +10 10 +0 18 15 1 +11 11 +0 19 15 1 +12 12 +0 20 15 1 +13 13 +0 21 15 1 +14 14 +0 22 15 1 +15 15 +0 23 15 1 +16 16 +0 29 15 1 +17 17 +0 30 15 1 +18 18 +0 31 15 1 +19 19 +0 32 15 1 +20 20 +0 33 15 1 +21 21 +0 55 15 1 +22 22 +1 1 1 7 +23 2 23 +24 23 24 +25 24 25 +26 25 26 +27 26 27 +28 27 28 +29 28 3 +1 2 1 7 +30 3 29 +31 29 30 +32 30 31 +33 31 32 +34 32 33 +35 33 34 +36 34 4 +1 3 1 7 +37 4 35 +38 35 36 +39 36 37 +40 37 38 +41 38 39 +42 39 40 +43 40 5 +1 4 1 7 +44 5 41 +45 41 42 +46 42 43 +47 43 44 +48 44 45 +49 45 46 +50 46 2 +1 21 1 2 +51 3 47 +52 47 10 +1 22 1 2 +53 2 48 +54 48 11 +1 23 1 2 +55 5 49 +56 49 12 +1 24 1 2 +57 4 50 +58 50 13 +1 25 1 2 +59 6 51 +60 51 12 +1 27 1 2 +61 12 52 +62 52 7 +1 28 1 2 +63 7 53 +64 53 11 +1 29 1 2 +65 11 54 +66 54 8 +1 30 1 2 +67 8 55 +68 55 10 +1 31 1 2 +69 10 56 +70 56 9 +1 32 1 2 +71 9 57 +72 57 13 +1 33 1 2 +73 13 58 +74 58 6 +1 45 1 3 +75 9 59 +76 59 60 +77 60 14 +1 46 1 3 +78 6 61 +79 61 62 +80 62 15 +1 50 1 3 +81 13 63 +82 63 64 +83 64 16 +1 51 1 2 +84 14 65 +85 65 16 +1 54 1 2 +86 16 66 +87 66 15 +1 60 1 5 +88 17 67 +89 67 68 +90 68 69 +91 69 70 +92 70 16 +1 62 1 2 +93 18 71 +94 71 19 +1 63 1 3 +95 19 72 +96 72 73 +97 73 7 +1 65 1 3 +98 11 74 +99 74 75 +100 75 18 +1 67 1 2 +101 20 76 +102 76 21 +1 68 1 3 +103 21 77 +104 77 78 +105 78 8 +1 70 1 3 +106 10 79 +107 79 80 +108 80 20 +1 77 1 2 +109 18 81 +110 81 21 +1 79 1 2 +111 20 82 +112 82 14 +1 94 1 3 +113 22 83 +114 83 84 +115 84 12 +1 95 1 2 +116 22 85 +117 85 19 +1 96 1 2 +118 22 86 +119 86 15 +2 53 3 6 +268 14 65 87 60 +269 60 87 88 59 +270 59 88 57 9 +271 65 16 64 87 +272 87 64 63 88 +273 88 63 13 57 +2 56 3 6 +274 16 66 89 64 +275 64 89 90 63 +276 63 90 58 13 +277 66 15 62 89 +278 89 62 61 90 +279 90 61 6 58 +2 61 3 6 +280 18 71 91 75 +281 75 91 92 74 +282 74 92 53 11 +283 71 19 72 91 +284 91 72 73 92 +285 92 73 7 53 +2 66 3 6 +286 20 76 93 80 +287 80 93 94 79 +288 79 94 55 10 +289 76 21 77 93 +290 93 77 78 94 +291 94 78 8 55 +2 76 3 6 +292 18 81 95 75 +293 75 95 96 74 +294 74 96 54 11 +295 81 21 77 95 +296 95 77 78 96 +297 96 78 8 54 +2 78 3 6 +298 20 82 97 80 +299 80 97 98 79 +300 79 98 56 10 +301 82 14 60 97 +302 97 60 59 98 +303 98 59 9 56 +2 100 3 6 +304 22 85 99 83 +305 83 99 100 84 +306 84 100 52 12 +307 85 19 72 99 +308 99 72 73 100 +309 100 73 7 52 +2 101 3 6 +310 6 61 101 51 +311 51 101 84 12 +312 61 62 102 101 +313 101 102 83 84 +314 62 15 86 102 +315 102 86 22 83 +2 102 2 37 +120 3 108 47 +121 4 50 109 +122 30 31 106 +123 32 33 107 +124 9 56 103 +125 9 103 57 +126 30 106 114 +127 33 113 107 +128 3 29 108 +129 4 109 34 +130 31 32 110 +131 47 108 112 +132 50 111 109 +133 34 109 113 +134 29 114 108 +135 32 107 110 +136 31 110 106 +137 13 111 50 +138 10 47 112 +139 104 109 111 +140 105 112 108 +141 104 113 109 +142 105 108 114 +143 33 34 113 +144 29 30 114 +145 104 107 113 +146 105 114 106 +147 57 103 107 +148 56 106 103 +149 57 107 104 +150 56 105 106 +151 103 110 107 +152 103 106 110 +153 10 112 56 +154 13 57 111 +155 56 112 105 +156 57 104 111 +2 103 2 37 +157 2 120 48 +158 3 47 121 +159 24 25 118 +160 26 27 119 +161 8 54 115 +162 8 115 55 +163 24 118 126 +164 27 125 119 +165 2 23 120 +166 3 121 28 +167 25 26 122 +168 48 120 124 +169 47 123 121 +170 28 121 125 +171 23 126 120 +172 26 119 122 +173 25 122 118 +174 10 123 47 +175 11 48 124 +176 116 121 123 +177 117 124 120 +178 116 125 121 +179 117 120 126 +180 27 28 125 +181 23 24 126 +182 116 119 125 +183 117 126 118 +184 55 115 119 +185 54 118 115 +186 55 119 116 +187 54 117 118 +188 115 122 119 +189 115 118 122 +190 10 55 123 +191 11 124 54 +192 54 124 117 +193 55 116 123 +2 104 2 37 +194 5 132 49 +195 2 48 133 +196 42 43 130 +197 44 45 131 +198 7 52 127 +199 7 127 53 +200 42 130 138 +201 45 137 131 +202 5 41 132 +203 2 133 46 +204 43 44 134 +205 49 132 136 +206 48 135 133 +207 46 133 137 +208 41 138 132 +209 44 131 134 +210 43 134 130 +211 11 135 48 +212 12 49 136 +213 128 133 135 +214 129 136 132 +215 128 137 133 +216 129 132 138 +217 45 46 137 +218 41 42 138 +219 128 131 137 +220 129 138 130 +221 53 127 131 +222 52 130 127 +223 53 131 128 +224 52 129 130 +225 127 134 131 +226 127 130 134 +227 11 53 135 +228 12 136 52 +229 52 136 129 +230 53 128 135 +2 105 2 37 +231 4 144 50 +232 5 49 145 +233 36 37 142 +234 38 39 143 +235 6 58 139 +236 6 139 51 +237 36 142 150 +238 39 149 143 +239 4 35 144 +240 5 145 40 +241 37 38 146 +242 50 144 148 +243 49 147 145 +244 40 145 149 +245 35 150 144 +246 38 143 146 +247 37 146 142 +248 12 147 49 +249 13 50 148 +250 140 145 147 +251 141 148 144 +252 140 149 145 +253 141 144 150 +254 39 40 149 +255 35 36 150 +256 140 143 149 +257 141 150 142 +258 51 139 143 +259 58 142 139 +260 51 143 140 +261 58 141 142 +262 139 146 143 +263 139 142 146 +264 12 51 147 +265 13 148 58 +266 51 140 147 +267 58 148 141 $EndElements diff --git a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h index c2fb8e6af9..4153728ef9 100644 --- a/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h +++ b/src/t8_cmesh/t8_cmesh_io/t8_cmesh_readmshfile.h @@ -33,12 +33,12 @@ #include /** The supported .msh file versions. - * Currently, we support gmsh's file version 2 and 4 in ASCII format. + * Currently, we only support gmsh's file version 4 in ASCII format. */ -#define T8_CMESH_N_SUPPORTED_MSH_FILE_VERSIONS 2 +#define T8_CMESH_N_SUPPORTED_MSH_FILE_VERSIONS 1 -/** The gmsh file versions that are supported. Currently version 2 and 4 in ASCII format */ -const int t8_cmesh_supported_msh_file_versions[T8_CMESH_N_SUPPORTED_MSH_FILE_VERSIONS] = { 2, 4 }; +/** The gmsh file versions that are supported. Currently version 4 in ASCII format */ +const int t8_cmesh_supported_msh_file_versions[T8_CMESH_N_SUPPORTED_MSH_FILE_VERSIONS] = { 4 }; T8_EXTERN_C_BEGIN (); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 569460e057..00b0ba4698 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -227,7 +227,5 @@ copy_test_file( test_parallel_file_1.vtu ) copy_test_file( test_polydata.pvtp ) copy_test_file( test_polydata_0.vtp ) copy_test_file( test_polydata_1.vtp ) -copy_test_file( test_msh_file_vers2_ascii.msh ) copy_test_file( test_msh_file_vers4_ascii.msh ) -copy_test_file( test_msh_file_vers2_bin.msh ) copy_test_file( test_msh_file_vers4_bin.msh ) diff --git a/test/t8_cmesh/t8_gtest_cmesh_readmshfile.cxx b/test/t8_cmesh/t8_gtest_cmesh_readmshfile.cxx index bf1b07951c..521ebfc859 100644 --- a/test/t8_cmesh/t8_gtest_cmesh_readmshfile.cxx +++ b/test/t8_cmesh/t8_gtest_cmesh_readmshfile.cxx @@ -35,84 +35,6 @@ * formats. All are not supported and we expect the reader to catch this. */ -static void -t8_supported_msh_file (t8_cmesh_t cmesh) -{ - double *vertices; - t8_locidx_t ltree_id; - t8_locidx_t lnum_trees; - t8_eclass_t tree_class; - - /* Description of the properties of the example msh-files. */ - const int number_elements = 4; - const t8_eclass_t elem_type = T8_ECLASS_TRIANGLE; - - int vertex[6][2] = { { 0, 0 }, { 2, 0 }, { 4, 0 }, { 1, 2 }, { 3, 2 }, { 2, 4 } }; - - int elements[4][3] = { { 0, 1, 3 }, { 1, 4, 3 }, { 1, 2, 4 }, { 3, 4, 5 } }; - - int face_neigh_elem[4][3] = { { 1, -1, -1 }, { 3, 0, 2 }, { -1, 1, -1 }, { -1, -1, 1 } }; - - ASSERT_FALSE (cmesh == NULL) << "Reading cmesh failed."; - - /* Checks if the cmesh was committed. */ - ASSERT_TRUE (t8_cmesh_is_committed (cmesh)) << "Cmesh commit failed"; - /* Checks for face consistency. */ - ASSERT_TRUE (t8_cmesh_trees_is_face_consistent (cmesh, cmesh->trees)) << "Cmesh face consistency failed."; - - /* Checks if the number of elements was read correctly. */ - ASSERT_EQ (t8_cmesh_get_num_trees (cmesh), number_elements) << "Number of elements in msh-file was read incorrectly."; - - /* Number of local trees. */ - lnum_trees = t8_cmesh_get_num_local_trees (cmesh); - /* Iterate through the local elements and check if they were read properly. */ - /* All trees should be local to the master rank. */ - for (t8_locidx_t ltree_it = 0; ltree_it < lnum_trees; ltree_it++) { - tree_class = t8_cmesh_get_tree_class (cmesh, ltree_it); - ASSERT_FALSE (t8_eclass_compare (tree_class, elem_type)) << "Element type in msh-file was read incorrectly."; - - /* Get pointer to the vertices of the tree. */ - vertices = t8_cmesh_get_tree_vertices (cmesh, ltree_it); - /* Checking the msh-files elements and nodes. */ - for (int i = 0; i < 3; i++) { - /* Checks if x and y coordinate of the nodes are not read correctly. */ - ASSERT_EQ (vertex[elements[ltree_it][i]][0], (int) vertices[3 * i]) << "x coordinate was read incorrectly"; - ASSERT_EQ (vertex[elements[ltree_it][i]][1], (int) vertices[(3 * i) + 1]) << "y coordinate was read incorrectly"; - - /* Checks whether the face neighbor elements are not read correctly. */ - ltree_id = t8_cmesh_get_face_neighbor (cmesh, ltree_it, i, NULL, NULL); - ASSERT_EQ (ltree_id, face_neigh_elem[ltree_it][i]) - << "The face neighbor element in the example test file was not read correctly."; - const t8_eclass_t neighbor_eclass = t8_cmesh_get_tree_face_neighbor_eclass (cmesh, ltree_it, i); - // If a face neighbor exists, the return value must match the element type, otherwise it must - // be T8_ECLASS_INVALID - const t8_eclass_t reference_value = face_neigh_elem[ltree_it][i] == -1 ? T8_ECLASS_INVALID : elem_type; - EXPECT_EQ (neighbor_eclass, reference_value) << "mismatch in face neighbor eclass."; - } - } -} - -TEST (t8_cmesh_readmshfile, test_msh_file_vers2_ascii) -{ - - const char fileprefix[BUFSIZ - 4] = "test/testfiles/test_msh_file_vers2_ascii"; - char filename[BUFSIZ]; - - snprintf (filename, BUFSIZ, "%s.msh", fileprefix); - - t8_debugf ("Checking msh file version 2 ascii...\n"); - - ASSERT_FALSE (access (filename, R_OK)) << "Could not open file " << filename; - - t8_cmesh_t cmesh = t8_cmesh_from_msh_file (fileprefix, 1, sc_MPI_COMM_WORLD, 2, 0, 0); - ASSERT_TRUE (cmesh != NULL) << "Could not read cmesh from ascii version 2, but should be able to."; - - t8_supported_msh_file (cmesh); - - /* The cmesh was read successfully and we need to destroy it. */ - t8_cmesh_destroy (&cmesh); -} - TEST (t8_cmesh_readmshfile, test_msh_file_vers4_ascii) { @@ -131,23 +53,6 @@ TEST (t8_cmesh_readmshfile, test_msh_file_vers4_ascii) t8_cmesh_destroy (&cmesh); } -TEST (t8_cmesh_readmshfile, test_msh_file_vers2_bin) -{ - - const char fileprefix[BUFSIZ - 4] = "test/testfiles/test_msh_file_vers2_bin"; - char filename[BUFSIZ]; - - snprintf (filename, BUFSIZ, "%s.msh", fileprefix); - - t8_debugf ("Checking msh file version 2 binary...\n"); - - ASSERT_FALSE (access (filename, R_OK)) << "Could not open file " << filename; - t8_cmesh_t cmesh = t8_cmesh_from_msh_file (fileprefix, 1, sc_MPI_COMM_WORLD, 2, 0, 0); - ASSERT_TRUE (cmesh == NULL) << "Expected fail of reading binary msh file v.2, but did not fail."; - - t8_debugf ("Error handling successful.\n"); -} - TEST (t8_cmesh_readmshfile, test_msh_file_vers4_bin) { diff --git a/test/testfiles/test_msh_file_vers2_ascii.msh b/test/testfiles/test_msh_file_vers2_ascii.msh deleted file mode 100644 index 568487df02..0000000000 --- a/test/testfiles/test_msh_file_vers2_ascii.msh +++ /dev/null @@ -1,19 +0,0 @@ -$MeshFormat -2.2 0 8 -$EndMeshFormat -$Nodes -6 -1 0 0 0 -2 2 0 0 -3 4 0 0 -4 1 2 0 -5 3 2 0 -6 2 4 0 -$EndNodes -$Elements -4 -1 2 2 0 1 1 2 4 -2 2 2 0 1 2 5 4 -3 2 2 0 1 2 3 5 -4 2 2 0 1 4 5 6 -$EndElements diff --git a/test/testfiles/test_msh_file_vers2_bin.msh b/test/testfiles/test_msh_file_vers2_bin.msh deleted file mode 100644 index 98409a1ecc..0000000000 Binary files a/test/testfiles/test_msh_file_vers2_bin.msh and /dev/null differ