Skip to content

Commit

Permalink
Merge branch 'SIMD_N' into 'master'
Browse files Browse the repository at this point in the history
Simd n

See merge request jschoeberl/ngsolve!267
  • Loading branch information
JSchoeberl committed Nov 24, 2017
2 parents c5356d2 + c2b0f19 commit a5835d8
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
23 changes: 14 additions & 9 deletions comp/meshaccess.cpp
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -778,16 +778,21 @@ namespace ngcomp
ArrayMem<int, 2> elnums; ArrayMem<int, 2> elnums;
auto fnums = GetElFacets(ElementId(BND,elnr)); auto fnums = GetElFacets(ElementId(BND,elnr));
GetFacetElements ( fnums[0], elnums ); GetFacetElements ( fnums[0], elnums );
if (elnums.Size()==1) if (elnums.Size()==0)
{ { // surface mesh only
in = GetElIndex(ElementId(VOL,elnums[0]))+1; in = 0;
out = 0; out = 0;
} }
else if (elnums.Size()==1)
{
in = GetElIndex(ElementId(VOL,elnums[0]))+1;
out = 0;
}
else else
{ {
out = GetElIndex(ElementId(VOL,elnums[0]))+1; out = GetElIndex(ElementId(VOL,elnums[0]))+1;
in = GetElIndex(ElementId(VOL,elnums[1]))+1; in = GetElIndex(ElementId(VOL,elnums[1]))+1;
} }
} }




Expand Down
2 changes: 1 addition & 1 deletion external_dependencies/netgen
Submodule netgen updated 47 files
+8 −0 CMakeLists.txt
+6 −13 cmake/SuperBuild.cmake
+5 −5 cmake/external_projects/tcltk.cmake
+16 −0 cmake/external_projects/zlib.cmake
+1 −1 doc/ng4.tex
+1 −1 libsrc/csg/genmesh.cpp
+262 −0 libsrc/general/hashtabl.hpp
+10 −0 libsrc/general/ngsimd.hpp
+5 −1 libsrc/general/profiler.cpp
+22 −2 libsrc/general/profiler.hpp
+281 −30 libsrc/gprim/adtree.cpp
+111 −18 libsrc/gprim/adtree.hpp
+7 −2 libsrc/gprim/geomobjects.hpp
+22 −22 libsrc/gprim/geomops.hpp
+41 −28 libsrc/interface/nginterface_v2.cpp
+1 −1 libsrc/meshing/adfront2.hpp
+1 −1 libsrc/meshing/adfront3.cpp
+1 −1 libsrc/meshing/adfront3.hpp
+60 −33 libsrc/meshing/curvedelems.cpp
+18 −14 libsrc/meshing/curvedelems.hpp
+5 −4 libsrc/meshing/delaunay.cpp
+1 −1 libsrc/meshing/delaunay2d.cpp
+12 −7 libsrc/meshing/meshclass.cpp
+1 −1 libsrc/meshing/meshclass.hpp
+2 −2 libsrc/meshing/meshing2.cpp
+1 −1 libsrc/meshing/triarls.cpp
+2 −2 libsrc/occ/occgenmesh.cpp
+13 −1 libsrc/occ/python_occ.cpp
+4 −3 libsrc/stlgeom/stlgeom.cpp
+87 −23 libsrc/stlgeom/stlgeomchart.cpp
+2 −2 libsrc/stlgeom/stlgeommesh.cpp
+235 −28 libsrc/stlgeom/stltool.cpp
+7 −3 libsrc/stlgeom/stltool.hpp
+4 −3 libsrc/stlgeom/stltopology.cpp
+1 −1 libsrc/stlgeom/stltopology.hpp
+13 −4 libsrc/visualization/soldata.hpp
+1 −1 ng/Togl-1.7/Togl.html
+1 −1 ng/Togl2.1/doc/download.html
+0 −0 ng/Togl2.1/gl/glext.h
+0 −0 ng/Togl2.1/gl/glxext.h
+0 −0 ng/Togl2.1/gl/wglext.h
+2 −2 ng/menustat.tcl
+1 −1 ng/nghelp.tcl
+1 −1 ng/onetcl.cpp
+5 −0 python/CMakeLists.txt
+3 −1 python/__init__.py
+1 −1 rules/triangle.rls

0 comments on commit a5835d8

Please sign in to comment.