Merge pull request #338 from dschwoerer/master

fixed that build failed if h5md is not present
espressomd · Jul 3, 2015 · 52d038e · 52d038e
2 parents dbf3659 + 3b294aa
commit 52d038e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/tcl/h5mdfile_tcl.cpp b/src/tcl/h5mdfile_tcl.cpp
@@ -5,12 +5,13 @@
 #include <stdlib.h>
 #include "parser.hpp"
 #include "communication.hpp"
-#include "hdf5.h"
 #include <stdio.h>
 #include <iostream>
 
 #ifdef H5MD
 
+#include "hdf5.h"
+
 typedef char h5string[1000];
 class H5mdfile
 {

diff --git a/src/tcl/integrate_sd_tcl.cpp b/src/tcl/integrate_sd_tcl.cpp
@@ -177,6 +177,14 @@ int tclcallback_sd_radius(Tcl_Interp *interp, void *_data)
 {
   double data = *(double *)_data;
   if (data <= 0) {
+    if (-1.001 < data && data < -.999){
+#if defined(SD) || defined(BD)
+      Tcl_AppendResult(interp, "SD radius was set to -1. It must be set to a reasonable value bevor the integrate_sd can be called.", (char *) NULL);
+#endif
+      sd_radius=-1;
+      mpi_bcast_parameter(FIELD_SD_RADIUS);
+      return (TCL_OK);
+    }
     Tcl_AppendResult(interp, "radius must be > 0.", (char *) NULL);
     return (TCL_ERROR);
   }