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

clipping timestep fix

Browse Source
This commit is contained in:
Joachim Schoeberl 2014-08-08 15:51:13 +00:00
parent e6bd7181f7
commit 66168dcd9e
5 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@ -20,6 +20,7 @@ AC_OPENMP
CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
# LDFLAGS="$LDFLAGS $OPENMP_CXXFLAGS" # LDFLAGS="$LDFLAGS $OPENMP_CXXFLAGS"
AM_PROG_AR
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
LT_INIT LT_INIT

1
libsrc/visualization/vssolution.cpp
View File

@ -799,7 +799,6 @@ namespace netgen
max2 (mesh->GetTimeStamp(), solutiontimestamp); max2 (mesh->GetTimeStamp(), solutiontimestamp);
} }
if (clipplanetimestamp < vispar.clipping.timestamp || if (clipplanetimestamp < vispar.clipping.timestamp ||
clipplanetimestamp < solutiontimestamp) clipplanetimestamp < solutiontimestamp)
{ {

2
ng/Makefile.am
View File

@ -14,7 +14,7 @@ if NGMKL
AM_CPPFLAGS += -DLINKMKL AM_CPPFLAGS += -DLINKMKL
MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_def MKL_LIBS = -L$(MKLROOT)/lib/intel64 -lmkl_intel_lp64 -lmkl_gnu_thread -lmkl_core -lmkl_def
endif endif
# -lpardiso500-GNU472-X86-64 -lgfortran
netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.la \ netgen_LDADD = $(top_builddir)/libsrc/visualization/libvisual.la \
$(top_builddir)/libsrc/csg/libcsgvis.la \ $(top_builddir)/libsrc/csg/libcsgvis.la \

12
ng/ngappinit.cpp
View File

@ -428,6 +428,13 @@ int Tcl_AppInit(Tcl_Interp * interp)
// from the ngsolve shared library // from the ngsolve shared library
#ifdef LINKMKL #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, extern "C" double ddot_(int *n, double *dx, int *incx, double *dy,
int *incy); int *incy);
@ -436,5 +443,10 @@ int mkldummy()
int n = 1, one = 1; int n = 1, one = 1;
double a = 1, b = 1; double a = 1, b = 1;
ddot_(&n, &a, &one, &b, &one); ddot_(&n, &a, &one, &b, &one);
/*
void * p;
integer li;
F77_FUNC(pardisoinit) (p, &li, &li, &li, &a, &li);
*/
} }
#endif #endif

9
ng/ngpkg.cpp
View File

@ -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.shininess = atof (Tcl_GetVar (interp, "::viewoptions.mat.shininess", TCL_GLOBAL_ONLY));
vispar.locviewer = atoi (Tcl_GetVar (interp, "::viewoptions.light.locviewer", 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)); vispar.transp = atof (Tcl_GetVar (interp, "::viewoptions.mat.transp", TCL_GLOBAL_ONLY));
VisualizationParameters::Clipping hclip; VisualizationParameters::Clipping hclip;
hclip.normal.X() = atof (Tcl_GetVar (interp, "::viewoptions.clipping.nx", TCL_GLOBAL_ONLY)); 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)); 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)); atoi (Tcl_GetVar (interp, "::viewoptions.clipping.notdomain", TCL_GLOBAL_ONLY));
if ( ! (hclip == vispar.clipping) ) 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.whitebackground = atoi (Tcl_GetVar (interp, "::viewoptions.whitebackground", TCL_GLOBAL_ONLY));
vispar.drawcoordinatecross = atoi (Tcl_GetVar (interp, "::viewoptions.drawcoordinatecross", TCL_GLOBAL_ONLY)); vispar.drawcoordinatecross = atoi (Tcl_GetVar (interp, "::viewoptions.drawcoordinatecross", TCL_GLOBAL_ONLY));