ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 21:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

bug fix for surface-element lists

Browse Source
This commit is contained in:
Joachim Schoeberl 2009-10-08 15:34:57 +00:00
parent 44ac64f85a
commit dd50309393
8 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libsrc/csg/specpoin.cpp
View File

@ -1381,12 +1381,13 @@ namespace netgen
if (!apoints.Size()) return; if (!apoints.Size()) return;
#define VERTSORT
#ifdef VERTSORT #ifdef VERTSORT
Vec<3> dir(1.2, 1.7, 0.9);
for (int i = 0; i < apoints.Size(); i++) for (int i = 0; i < apoints.Size(); i++)
for (int j = 0; j < apoints.Size()-1; j++) for (int j = 0; j < apoints.Size()-1; j++)
if (apoints[j](2) > apoints[j+1](2)) if ( (dir * Vec<3> (apoints[j])) > (dir * Vec<3> (apoints[j+1])))
swap (apoints[j], apoints[j+1]); swap (apoints[j], apoints[j+1]);
#endif #endif

2
libsrc/meshing/bisect.cpp
View File

@ -3786,7 +3786,7 @@ namespace netgen
mesh.ComputeNVertices(); mesh.ComputeNVertices();
mesh.RebuildSurfaceElementLists();
// update identification tables // update identification tables

17
libsrc/meshing/meshclass.cpp
View File

@ -2297,6 +2297,8 @@ namespace netgen
} }
} }
RebuildSurfaceElementLists ();
/*
for (int i = 0; i < facedecoding.Size(); i++) for (int i = 0; i < facedecoding.Size(); i++)
facedecoding[i].firstelement = -1; facedecoding[i].firstelement = -1;
for (int i = surfelements.Size()-1; i >= 0; i--) for (int i = surfelements.Size()-1; i >= 0; i--)
@ -2305,7 +2307,7 @@ namespace netgen
surfelements[i].next = facedecoding[ind-1].firstelement; surfelements[i].next = facedecoding[ind-1].firstelement;
facedecoding[ind-1].firstelement = i; facedecoding[ind-1].firstelement = i;
} }
*/
timestamp = NextTimeStamp(); timestamp = NextTimeStamp();
// Compress(); // Compress();
@ -4978,6 +4980,19 @@ namespace netgen
} }
void Mesh :: RebuildSurfaceElementLists ()
{
for (int i = 0; i < facedecoding.Size(); i++)
facedecoding[i].firstelement = -1;
for (int i = surfelements.Size()-1; i >= 0; i--)
{
int ind = surfelements[i].GetIndex();
surfelements[i].next = facedecoding[ind-1].firstelement;
facedecoding[ind-1].firstelement = i;
}
}
void Mesh :: GetSurfaceElementsOfFace (int facenr, Array<SurfaceElementIndex> & sei) const void Mesh :: GetSurfaceElementsOfFace (int facenr, Array<SurfaceElementIndex> & sei) const
{ {
static int timer = NgProfiler::CreateTimer ("GetSurfaceElementsOfFace"); static int timer = NgProfiler::CreateTimer ("GetSurfaceElementsOfFace");

1
libsrc/meshing/meshclass.hpp
View File

@ -290,6 +290,7 @@ public:
{ return surfelements[ei]; } { return surfelements[ei]; }
void RebuildSurfaceElementLists ();
void GetSurfaceElementsOfFace (int facenr, Array<SurfaceElementIndex> & sei) const; void GetSurfaceElementsOfFace (int facenr, Array<SurfaceElementIndex> & sei) const;
ElementIndex AddVolumeElement (const Element & el); ElementIndex AddVolumeElement (const Element & el);

1
libsrc/meshing/refine.cpp
View File

@ -610,6 +610,7 @@ namespace netgen
} }
mesh.ComputeNVertices(); mesh.ComputeNVertices();
mesh.RebuildSurfaceElementLists();
return; return;
int cnttrials = 10; int cnttrials = 10;

2
libsrc/meshing/secondorder.cpp
View File

@ -287,7 +287,7 @@ namespace netgen
} }
mesh.ComputeNVertices(); mesh.ComputeNVertices();
mesh.RebuildSurfaceElementLists();
// ValidateSecondOrder (mesh); // ValidateSecondOrder (mesh);
} }

2
ng/Makefile.am
View File

@ -16,7 +16,7 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \
$(top_builddir)/libsrc/gprim/libgprim.la \ $(top_builddir)/libsrc/gprim/libgprim.la \
$(top_builddir)/libsrc/linalg/libla.la \ $(top_builddir)/libsrc/linalg/libla.la \
$(top_builddir)/libsrc/general/libgeneral.la \ $(top_builddir)/libsrc/general/libgeneral.la \
$(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS) $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(FFMPEG_LIBS) $(JPEGLIB_LIBS) $(PKG_LIBS)
# #
# add for static linkage of ngsolve: # add for static linkage of ngsolve:
# /opt/netgen/lib/libngsolve.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngfemng.a /opt/netgen/lib/libngmg.a /opt/netgen/lib/libngla.a /opt/netgen/lib/libngbla.a /opt/netgen/lib/libngstd.a -llapack # /opt/netgen/lib/libngsolve.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngfemng.a /opt/netgen/lib/libngmg.a /opt/netgen/lib/libngla.a /opt/netgen/lib/libngbla.a /opt/netgen/lib/libngstd.a -llapack

2
ng/ngappinit.cpp
View File

@ -40,7 +40,6 @@ namespace netgen
using netgen::parameters; using netgen::parameters;
using netgen::ngdir; using netgen::ngdir;
using netgen::verbose; using netgen::verbose;
@ -348,7 +347,6 @@ extern "C" int Ng_Vis_Init (Tcl_Interp * interp);
// extern Tcl_PackageInitProc * Tk_SafeInit; // extern Tcl_PackageInitProc * Tk_SafeInit;
/* /*
* *
* Initialize packages * Initialize packages