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

openmp

Browse Source
This commit is contained in:
Joachim Schoeberl 2009-04-05 11:30:37 +00:00
parent 474d156e61
commit 53834fdecd
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ng/Makefile.am
View File

@ -18,11 +18,18 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \
$(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) $(PKG_LIBS) $(OCCLIBS) -L$(TK_BIN_DIR)/Togl1.7 $(TOGLLIBDIR) -lTogl1.7 $(LIBGLU) $(TK_LIB_SPEC) $(TCL_LIB_SPEC) $(MPI_LIBS) $(PKG_LIBS)
#
# add for static linkage of ngsolve:
# /opt/netgen/lib/libngsolve.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngfem.a /opt/netgen/lib/libngcomp.a /opt/netgen/lib/libngfem.a /opt/netgen/lib/libngmg.a /opt/netgen/lib/libngla.a /opt/netgen/lib/libngbla.a /opt/netgen/lib/libngstd.a
#
#
dist_bin_SCRIPTS = dialog.tcl menustat.tcl ngicon.tcl ng.tcl \ dist_bin_SCRIPTS = dialog.tcl menustat.tcl ngicon.tcl ng.tcl \
ngvisual.tcl sockets.tcl drawing.tcl nghelp.tcl ngshell.tcl \ ngvisual.tcl sockets.tcl drawing.tcl nghelp.tcl ngshell.tcl \
ngtesting.tcl parameters.tcl variables.tcl ngtesting.tcl parameters.tcl variables.tcl
# netgen_LDFLAGS = -pg -static
netgen_LDFLAGS = -rdynamic -pg netgen_LDFLAGS = -rdynamic -pg -static

13
ng/ngappinit.cpp
View File

@ -131,10 +131,6 @@ int main(int argc, char ** argv)
cout << "Including sparse direct solver Pardiso" << endl; cout << "Including sparse direct solver Pardiso" << endl;
#endif #endif
#ifdef _OPENMP
cout << "Running OpenMP - parallel using " << omp_get_max_threads() << " threads" << endl;
// cout << "(can be changed by setting OMP_NUM_THREADS)" << endl;
#endif
#ifdef PARALLEL #ifdef PARALLEL
cout << "Including MPI " << endl; cout << "Including MPI " << endl;
@ -358,6 +354,9 @@ extern "C" int Ng_Vis_Init (Tcl_Interp * interp);
* *
*/ */
// extern "C" int NGSolve_Init (Tcl_Interp * interp);
int Tcl_AppInit(Tcl_Interp * interp) int Tcl_AppInit(Tcl_Interp * interp)
{ {
@ -413,6 +412,12 @@ int Tcl_AppInit(Tcl_Interp * interp)
} }
/*
if (NGSolve_Init(interp) == TCL_ERROR)
return TCL_ERROR;
*/
#ifdef DEMOAPP #ifdef DEMOAPP
extern int DemoApp_Init (Tcl_Interp * interp); extern int DemoApp_Init (Tcl_Interp * interp);
if (DemoApp_Init(interp) == TCL_ERROR) if (DemoApp_Init(interp) == TCL_ERROR)