This commit is contained in:
Joachim Schoeberl 2011-02-18 19:58:17 +00:00
parent 2261c36684
commit b0f637862b
5 changed files with 5 additions and 35 deletions

View File

@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
METASOURCES = AUTO METASOURCES = AUTO
SUBDIRS = libsrc ng tutorials doc windows SUBDIRS = libsrc ng tutorials doc windows nglib
# nglib # nglib
# TESTS = ng/netgen -batchmode # TESTS = ng/netgen -batchmode

View File

@ -158,7 +158,7 @@ case "${TEA_WINDOWINGSYSTEM}" in
;; ;;
x11) x11)
AC_SUBST(TOGL_WINDOWINGSYSTEM,TOGL_X11) AC_SUBST(TOGL_WINDOWINGSYSTEM,TOGL_X11)
TEA_ADD_LIBS([-lGL]) TEA_ADD_LIBS([-lGL -lXmu])
LIBGLU=-lGLU LIBGLU=-lGLU
;; ;;
win32) win32)

View File

@ -209,7 +209,6 @@ extern MPI_Comm MPI_HIGHORDER_COMM;
if ( !size ) return; if ( !size ) return;
MPI_Bcast (&s[0], size, MyGetMPIType<T>(), root, comm); MPI_Bcast (&s[0], size, MyGetMPIType<T>(), root, comm);
} }
template <class T, class T2> template <class T, class T2>
inline void MyMPI_Allgather (const T & send, FlatArray<T2> recv, MPI_Comm comm) inline void MyMPI_Allgather (const T & send, FlatArray<T2> recv, MPI_Comm comm)

View File

@ -935,6 +935,7 @@ namespace netgen
NgProfiler::StopTimer (timer2); NgProfiler::StopTimer (timer2);
NgProfiler::StartTimer (timer3); NgProfiler::StartTimer (timer3);
for (int dest = 1; dest < ntasks; dest++) for (int dest = 1; dest < ntasks; dest++)
{ {
FlatArray<PointIndex> verts = verts_of_proc[dest]; FlatArray<PointIndex> verts = verts_of_proc[dest];

View File

@ -1,14 +1,8 @@
#include <mystdlib.h> #include <mystdlib.h>
#include "meshing.hpp" #include "meshing.hpp"
#define DEBUG
namespace netgen namespace netgen
{ {
template <class T> template <class T>
void QuickSortRec (FlatArray<T> & data, void QuickSortRec (FlatArray<T> & data,
int left, int right) int left, int right)
@ -429,9 +423,11 @@ namespace netgen
} }
} }
/*
*testout << "edge 2 vert:" << endl; *testout << "edge 2 vert:" << endl;
for (int i = 0; i < edge2vert.Size(); i++) for (int i = 0; i < edge2vert.Size(); i++)
*testout << edge2vert[i][0] << " " << edge2vert[i][1] << endl; *testout << edge2vert[i][0] << " " << edge2vert[i][1] << endl;
*/
for (int i = 1; i <= nse; i++) for (int i = 1; i <= nse; i++)
{ {
@ -1079,35 +1075,9 @@ namespace netgen
face2vert.SetAllocSize (face2vert.Size()); face2vert.SetAllocSize (face2vert.Size());
// face table complete // face table complete
/*
*testout << "face2vert: ";
face2vert.PrintMemInfo(cout);
*testout << "faces: ";
faces.PrintMemInfo(cout);
*testout << "hashtable: ";
vert2face.PrintMemInfo(cout);
*/
#ifdef PARALLEL #ifdef PARALLEL
(*testout) << " RESET Paralleltop" << endl; (*testout) << " RESET Paralleltop" << endl;