Changeset ac6d04 for vmg_particles

Timestamp:

Apr 10, 2012, 1:55:49 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

a40eea

Parents:

d24c2f

Message:

Merge recent changes of the vmg library into ScaFaCos.

Includes a fix for the communication problems on Jugene.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1666 5161e1c8-67bf-11de-9fd5-51895aff932f

Location:

vmg_particles

Files:

• Makefile.am (modified) (1 diff)
• vmg_particles.cpp (modified) (1 diff)

vmg_particles/Makefile.am

@@ -1 +1 @@
 noinst_PROGRAMS = vmg_particles
+
+LIBVMG = \
+        $(top_builddir)/src/libfcs_vmg.a \
+        $(BOOST_SYSTEM_LIB) \
+        $(BOOST_FILESYSTEM_LIB)
 
 vmg_particles_SOURCES = \
         vmg_particles.cpp
 
-vmg_particles_CPPFLAGS = $(BOOST_CPPFLAGS) -I $(top_srcdir)/src
-
-vmg_particles_LDADD = $(BOOST_LDFLAGS) $(LIBVMG)
+vmg_particles_CPPFLAGS = $(VTK_CXXFLAGS) $(BOOST_CPPFLAGS) -I $(top_srcdir)/src
+vmg_particles_LDFLAGS = $(VTK_LDFLAGS) $(BOOST_LDFLAGS) 
+vmg_particles_LDADD = $(LIBVMG) $(VTK_LIBS)
 
 if HAVE_LAPACK
 vmg_particles_LDADD += $(LAPACK_LIBS) $(BLAS_LIBS) $(FCLIBS)
 endif
-
-vmg_particles_DEPENDENCIES = $(LIBVMG)

vmg_particles/vmg_particles.cpp

@@ -5 +5 @@
 #ifdef HAVE_MPI
 #include <mpi.h>
+#ifdef HAVE_MARMOT
+#include <enhancempicalls.h>
+#include <sourceinfompicalls.h>
+#endif
 #include "comm/mpi/error_handler.hpp"
 #endif