From 775a883375bd799962721c1d99287d2f433cf2e2 Mon Sep 17 00:00:00 2001 From: Joachim Schoeberl Date: Fri, 13 May 2011 11:56:59 +0000 Subject: [PATCH] --- configure.ac | 7 ++++--- ng/occgeom.tcl | 4 ++-- tutorials/cubeandring.geo | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index d3501c6e..911cfe9f 100644 --- a/configure.ac +++ b/configure.ac @@ -87,11 +87,12 @@ AC_ARG_ENABLE([nglib], AC_ARG_ENABLE([parallel], [AC_HELP_STRING([--enable-parallel],[enable mpi parallelization])], - [AC_SUBST([MPI_INCLUDES], "-I/usr/lib64/mpi/gcc/openmpi/include -DPARALLEL -I/usr/include/metis -DMETIS -DVTRACE -I/usr/local/include/vampirtrace") - AC_SUBST([MPI_LIBS], "-L/usr/lib64/mpi/gcc/openmpi/lib64 -lmpi_cxx -lmetis -lvt-hyb") + [AC_SUBST([MPI_INCLUDES], "-I/usr/lib64/mpi/gcc/openmpi/include -DPARALLEL -I/usr/include/metis -DMETIS -I/usr/local/include/vampirtrace") + AC_SUBST([MPI_LIBS], "-L/usr/lib64/mpi/gcc/openmpi/lib64 -lmpi_cxx -lmetis") ] ) - +# -DVTRACE +# -lvt-hyb # [AC_SUBST([MPI_INCLUDES], "-I/opt/mpich/include -I/usr/include/mpich2 -I/usr/include/metis -DPARALLEL -I/usr/share/metis/Lib -DMETIS -DVTRACE -I/usr/local/include/vampirtrace") # AC_SUBST([MPI_LIBS], "-lmetis -L/opt/mpich/ch-p4/lib -lmpich") diff --git a/ng/occgeom.tcl b/ng/occgeom.tcl index efab5c33..0a8e91e7 100644 --- a/ng/occgeom.tcl +++ b/ng/occgeom.tcl @@ -1,6 +1,6 @@ if { [catch { load liboccvis[info sharedlibextension] Ng_OCC } result ] } { - puts "cannot load occ" - puts "error: $result" + # puts "cannot load occ" + # puts "error: $result" # dummy proc rebuildoccdialog { } { } diff --git a/tutorials/cubeandring.geo b/tutorials/cubeandring.geo index 25629fdf..11f4f544 100644 --- a/tutorials/cubeandring.geo +++ b/tutorials/cubeandring.geo @@ -3,7 +3,8 @@ algebraic3d curve2d testcurve=(8; -0.5,1; -0.55,1.5; - -0.275,1.775; +# -0.275,1.775; + -0.5,2; 0,2.05; 0.5,2; 0.55,1.5;