Fixed compilation without MPI

espressomd · Jul 23, 2014 · ad4297c · ad4297c
1 parent d350be3
commit ad4297c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/maintainer/find_missing_header.sh b/maintainer/find_missing_header.sh
@@ -57,5 +57,7 @@ else
 fi
 echo
 
-
+if [ -n "$nolicense" ] || [ -n "$missing_current_copyright" ]; then
+  exit 1
+fi  
 
diff --git a/maintainer/update_header.sh b/maintainer/update_header.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2012,2013 Olaf Lenz
+# Copyright (C) 2012,2013,2014 Olaf Lenz
 #  
 # This file is part of ESPResSo.
 #  

diff --git a/src/core/energy.cpp b/src/core/energy.cpp
@@ -54,6 +54,7 @@ void energy_calc(double *result)
     return;
 
   init_energies(&energy);
+
 #ifdef CUDA
   clear_energy_on_GPU();
 #endif

diff --git a/src/core/initialize.cpp b/src/core/initialize.cpp
@@ -228,11 +228,11 @@ void on_observable_calc()
   EVENT_TRACE(fprintf(stderr, "%d: on_observable_calc\n", this_node));
   /* Prepare particle structure: Communication step: number of ghosts and ghost information */
 
-  if(resort_particles)
+  if (resort_particles)
     cells_resort_particles(CELL_GLOBAL_EXCHANGE);
 
 #ifdef ELECTROSTATICS  
-  if(reinit_electrostatics) {
+  if (reinit_electrostatics) {
     EVENT_TRACE(fprintf(stderr, "%d: reinit_electrostatics\n", this_node));
     switch (coulomb.method) {
 #ifdef P3M

diff --git a/src/python/espressomd/Makefile.am b/src/python/espressomd/Makefile.am
@@ -25,7 +25,7 @@ AM_LDFLAGS = $(PYTHON_LDFLAGS) -module -avoid-version -no-undefined
 LIBS =  $(top_builddir)/src/core/libEspresso.la @LIBS@
 
 if MPI_FAKE
-AM_CPPFLAGS += -I$(top_srcdir)/src/mpifake
+AM_CPPFLAGS += -I$(top_srcdir)/src/core/mpifake
 endif
 
 # Build rules for cython

diff --git a/testsuite/lj.tcl b/testsuite/lj.tcl
@@ -47,7 +47,6 @@ proc write_data {file} {
     close $f
 }
 
-
 if { [catch {
     read_data "lj_system.data"
 
@@ -60,6 +59,7 @@ if { [catch {
     inter 0 0 lennard-jones 1.0 1.0 1.12246
     inter 1 1 lennard-jones 1.3 0.5 2 auto 0.0
     inter 0 1 lennard-jones 2.2 1.0 1.12246 0.0 0.5
+
     integrate 0
 
     # here you can create the necessary snapshot
@@ -74,6 +74,7 @@ if { [catch {
     set toteng [analyze energy total]
     set totprs [analyze pressure total]
 
+
     if { [expr abs($toteng - $cureng)] > $epsilon } {
 	error "system has unwanted energy contributions of [format %e [expr $toteng - $cureng]]"
     }