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

suggestions by E.A. (salome)

Browse Source
This commit is contained in:
Joachim Schoeberl 2010-05-18 11:28:15 +00:00
parent 33322c741c
commit 768ef87cac
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/general/Makefile.am
View File

@ -6,8 +6,8 @@ include_HEADERS = ngexception.hpp
AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include AM_CPPFLAGS = $(MPI_INCLUDES) -I$(top_srcdir)/libsrc/include
METASOURCES = AUTO METASOURCES = AUTO
noinst_LTLIBRARIES = libgeneral.la noinst_LTLIBRARIES = libgen.la
libgeneral_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \ libgen_la_SOURCES = array.cpp bitarray.cpp dynamicmem.cpp flags.cpp \
hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \ hashtabl.cpp mystring.cpp ngexception.cpp optmem.cpp parthreads.cpp \
profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp profiler.cpp seti.cpp sort.cpp spbita2d.cpp symbolta.cpp table.cpp

2
libsrc/general/template.hpp
View File

@ -33,7 +33,7 @@ extern ostream * myerr;
/** Error messages display. /** Error messages display.
Error messages are displayed by this function */ Error messages are displayed by this function */
extern void MyError (const char * ch); DLL_HEADER extern void MyError (const char * ch);
/** Rings the bell. /** Rings the bell.

2
libsrc/meshing/global.hpp
View File

@ -13,7 +13,7 @@
*/ */
/// ///
extern double GetTime (); DLL_HEADER extern double GetTime ();
extern void ResetTime (); extern void ResetTime ();
/// ///

2
ng/Makefile.am
View File

@ -15,7 +15,7 @@ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.a \
$(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/meshing/libmesh.la \
$(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/libgen.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:

2
ng/menustat.tcl
View File

@ -839,7 +839,7 @@ menu .ngmenu.help
.ngmenu.help add command -label "About..." \ .ngmenu.help add command -label "About..." \
-command { -command {
tk_messageBox -message "This is NETGEN \nmainly written by \nJoachim Schöberl \nthanks to \nRobert Gaisbauer, Johannes Gerstmayr, Philippose Rajan" tk_messageBox -message "This is NETGEN \nmainly written by \nJoachim Schoeberl \nthanks to \nRobert Gaisbauer, Johannes Gerstmayr, Philippose Rajan"
} }
# tk_menuBar .mbar .mbar.file .mbar.mesh .mbar.test .mbar.help # tk_menuBar .mbar .mbar.file .mbar.mesh .mbar.test .mbar.help

6
ng/ngpkg.cpp
View File

@ -246,7 +246,7 @@ namespace netgen
#ifndef SMALLLIB #ifndef SMALLLIB
// Destination for messages, errors, ... // Destination for messages, errors, ...
void Ng_PrintDest(const char * s) DLL_HEADER void Ng_PrintDest(const char * s)
{ {
#ifdef PARALLEL #ifdef PARALLEL
int id, ntasks; int id, ntasks;
@ -263,7 +263,7 @@ namespace netgen
(*mycout) << "p" << id << ": " << s << flush ; (*mycout) << "p" << id << ": " << s << flush ;
} }
void MyError(const char * ch) DLL_HEADER void MyError(const char * ch)
{ {
cout << ch; cout << ch;
(*testout) << "Error !!! " << ch << endl << flush; (*testout) << "Error !!! " << ch << endl << flush;
@ -277,7 +277,7 @@ namespace netgen
} }
#ifndef SMALLLIB #ifndef SMALLLIB
double GetTime () DLL_HEADER double GetTime ()
{ {
return double(clock() - starttimea) / CLOCKS_PER_SEC; return double(clock() - starttimea) / CLOCKS_PER_SEC;
} }

2
nglib/Makefile.am
View File

@ -16,7 +16,7 @@ libnglib_la_LIBADD = \
$(top_builddir)/libsrc/meshing/libmesh.la \ $(top_builddir)/libsrc/meshing/libmesh.la \
$(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/libgen.la \
$(OCCLIBS) $(MPI_LIBS) $(OCCLIBS) $(MPI_LIBS)
libnglib_la_LDFLAGS = -avoid-version libnglib_la_LDFLAGS = -avoid-version

6
nglib/nglib.cpp
View File

@ -963,18 +963,18 @@ namespace netgen
char geomfilename[255]; char geomfilename[255];
void MyError (const char * ch) DLL_HEADER void MyError (const char * ch)
{ {
cerr << ch; cerr << ch;
} }
//Destination for messages, errors, ... //Destination for messages, errors, ...
void Ng_PrintDest(const char * s) DLL_HEADER void Ng_PrintDest(const char * s)
{ {
(*mycout) << s << flush; (*mycout) << s << flush;
} }
double GetTime () DLL_HEADER double GetTime ()
{ {
return 0; return 0;
} }

2
nglib/nglib.h
View File

@ -24,7 +24,7 @@
// Philippose - 14.02.2009 // Philippose - 14.02.2009
// Modifications for creating a DLL in Windows // Modifications for creating a DLL in Windows
#ifdef WIN32 #ifdef WIN32
#ifdef NGLIB_EXPORTS #ifdef NGLIB_EXPORTS || nglib_EXPORTS
#define DLL_HEADER __declspec(dllexport) #define DLL_HEADER __declspec(dllexport)
#else #else
#define DLL_HEADER __declspec(dllimport) #define DLL_HEADER __declspec(dllimport)