diff --git a/configure.ac b/configure.ac index a8759f10..29c6321b 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,7 @@ AC_OPENMP CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" # LDFLAGS="$LDFLAGS $OPENMP_CXXFLAGS" +AM_PROG_AR AC_PROG_LIBTOOL LT_INIT diff --git a/libsrc/visualization/vssolution.cpp b/libsrc/visualization/vssolution.cpp index 56a44991..4c031c75 100644 --- a/libsrc/visualization/vssolution.cpp +++ b/libsrc/visualization/vssolution.cpp @@ -799,7 +799,6 @@ namespace netgen max2 (mesh->GetTimeStamp(), solutiontimestamp); } - if (clipplanetimestamp < vispar.clipping.timestamp || clipplanetimestamp < solutiontimestamp) { diff --git a/ng/Makefile.am b/ng/Makefile.am index 3626eef8..64328883 100644 --- a/ng/Makefile.am +++ b/ng/Makefile.am @@ -14,7 +14,7 @@ if NGMKL AM_CPPFLAGS += -DLINKMKL MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_def endif - +# -lpardiso500-GNU472-X86-64 -lgfortran netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.la \ $(top_builddir)/libsrc/csg/libcsgvis.la \ diff --git a/ng/ngappinit.cpp b/ng/ngappinit.cpp index 4448567d..e9d43e8f 100644 --- a/ng/ngappinit.cpp +++ b/ng/ngappinit.cpp @@ -428,6 +428,13 @@ int Tcl_AppInit(Tcl_Interp * interp) // from the ngsolve shared library #ifdef LINKMKL + +typedef long int integer; +#define F77_FUNC(func) func ## _ +extern "C" integer F77_FUNC(pardisoinit) + (void *, integer *, integer *, integer *, double *, integer *); + + extern "C" double ddot_(int *n, double *dx, int *incx, double *dy, int *incy); @@ -436,5 +443,10 @@ int mkldummy() int n = 1, one = 1; double a = 1, b = 1; ddot_(&n, &a, &one, &b, &one); + /* + void * p; + integer li; + F77_FUNC(pardisoinit) (p, &li, &li, &li, &a, &li); + */ } #endif diff --git a/ng/ngpkg.cpp b/ng/ngpkg.cpp index 6d7e0209..1e943381 100644 --- a/ng/ngpkg.cpp +++ b/ng/ngpkg.cpp @@ -2879,7 +2879,7 @@ void PlayAnimFile(const char* name, int speed, int maxcnt) vispar.shininess = atof (Tcl_GetVar (interp, "::viewoptions.mat.shininess", TCL_GLOBAL_ONLY)); vispar.locviewer = atoi (Tcl_GetVar (interp, "::viewoptions.light.locviewer", TCL_GLOBAL_ONLY)); vispar.transp = atof (Tcl_GetVar (interp, "::viewoptions.mat.transp", TCL_GLOBAL_ONLY)); - + VisualizationParameters::Clipping hclip; hclip.normal.X() = atof (Tcl_GetVar (interp, "::viewoptions.clipping.nx", TCL_GLOBAL_ONLY)); hclip.normal.Y() = atof (Tcl_GetVar (interp, "::viewoptions.clipping.ny", TCL_GLOBAL_ONLY)); @@ -2893,9 +2893,10 @@ void PlayAnimFile(const char* name, int speed, int maxcnt) atoi (Tcl_GetVar (interp, "::viewoptions.clipping.notdomain", TCL_GLOBAL_ONLY)); if ( ! (hclip == vispar.clipping) ) - hclip.timestamp = NextTimeStamp(); - vispar.clipping = hclip; - + { + vispar.clipping = hclip; + vispar.clipping.timestamp = NextTimeStamp(); + } vispar.whitebackground = atoi (Tcl_GetVar (interp, "::viewoptions.whitebackground", TCL_GLOBAL_ONLY)); vispar.drawcoordinatecross = atoi (Tcl_GetVar (interp, "::viewoptions.drawcoordinatecross", TCL_GLOBAL_ONLY));