change travis?

.travis.yml

@@ -10,8 +10,7 @@ before_install:
   - export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-3.3
 
 script:
-  - mkdir build; cd build
-  - cmake -DCMAKE_INSTALL_PREFIX=~/OpenMM -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG="-g -fsanitize=address -fno-omit-frame-pointer -O2" ..
+  - cmake -DCMAKE_INSTALL_PREFIX=~/OpenMM -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_FLAGS_DEBUG="-g -fsanitize=address -fno-omit-frame-pointer -O2" .
   - make
   - make test
   - make install

openmmapi/src/ThreadPool.cpp

@@ -29,6 +29,7 @@
  * USE OR OTHER DEALINGS IN THE SOFTWARE.                                     *
  * -------------------------------------------------------------------------- */
 
+#include <stdlib.h>
 #include "openmm/internal/ThreadPool.h"
 #include "openmm/internal/hardware.h"
 
@@ -61,7 +62,15 @@ static void* threadBody(void* args) {
 }
 
 ThreadPool::ThreadPool() {
-    numThreads = getNumProcessors();
+    char* openmmNumThreads = getenv("OPENMM_NUM_THREADS");
+    char* end = openmmNumThreads;
+    if (openmmNumThreads != NULL) {
+        numThreads = strtol(openmmNumThreads, &end, 0);
+    }
+    if (openmmNumThreads == NULL || openmmNumThreads==end) {
+        numThreads = getNumProcessors();
+    }
+        
     pthread_cond_init(&startCondition, NULL);
     pthread_cond_init(&endCondition, NULL);
     pthread_mutex_init(&lock, NULL);