Merge pull request #362 from pdziekan/subsidence_profile

Subsidence velocity with a profile

Author: pdziekan

.travis.yml

@@ -150,11 +150,11 @@ install:
       #- if [[ $TRAVIS_OS_NAME == 'osx' ]]; then echo 'import sys; sys.path.insert(1, "/usr/local/lib/python2.7/site-packages")' >> /Users/travis/Library/Python/2.7/lib/python/site-packages/homebrew.pth; fi
     - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install blitz boost-python; fi
     - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then brew install gnuplot; fi
-    - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then sudo pip2 install http://prdownloads.sourceforge.net/gnuplot-py/gnuplot-py-1.8.tar.gz?download; fi
       # https://github.com/pypa/pip/issues/3165
     - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then sudo pip2 install -U matplotlib --ignore-installed six; fi
     - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then sudo pip2 install -U pytest --ignore-installed six; fi
     - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then sudo pip2 install --only-binary=numpy,scipy numpy scipy --ignore-installed six; fi
+    - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then sudo pip2 install http://prdownloads.sourceforge.net/gnuplot-py/gnuplot-py-1.8.tar.gz?download; fi
 
     - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then \curl -sSL https://get.rvm.io | bash -s -- --branch stable; fi
     - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then rvm reload; fi

.travis_scripts/cuda.sh

@@ -6,8 +6,8 @@ cd build
 #if [[ $TRAVIS_OS_NAME == 'linux' && $CXX == 'clang++' ]]; then cmake ../; fi 
 if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cmake .. -DPYTHON_LIBRARY=$PY_LIB -DPYTHON_INCLUDE_DIR=$PY_INC; fi
 cmake -DCMAKE_BUILD_TYPE=Debug ../
-VERBOSE=1 make
+VERBOSE=1 travis_wait 20 make -j2
 cmake -DCMAKE_BUILD_TYPE=Release ../ 
-VERBOSE=1 make 
+VERBOSE=1 travis_wait 20 make -j2
 cd ../..
 set +ex # see https://github.com/travis-ci/travis-ci/issues/6522

.travis_scripts/icicle.sh

@@ -5,7 +5,7 @@ set -ex
 mkdir build 
 cd build
 #if [[ $TRAVIS_OS_NAME == 'linux' && $CXX == 'clang++' ]]; then cmake ../; fi 
-if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cmake .. -DPYTHON_LIBRARY=${PY_LIB} -DPYTHON_INCLUDE_DIR=${PY_INC}; fi
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cmake .. -DPYTHON_LIBRARY=${PY_LIB} -DPYTHON_INCLUDE_DIR=${PY_INC} -DBoost_NO_BOOST_CMAKE=ON; fi
 # make with RelWithDebInfo to have high optimization with asserts on
 cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ../ 
 VERBOSE=1 make 

.travis_scripts/parcel.sh

@@ -6,8 +6,7 @@ mkdir build
 cd build
 #if [[ $TRAVIS_OS_NAME == 'linux' && $CXX == 'clang++' ]]; then cmake ../; fi 
 
-if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cmake .. -DPYTHON_LIBRARY=${PY_LIB} -DPYTHON_INCLUDE_DIR=${PY_INC}; fi
-
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cmake .. -DPYTHON_LIBRARY=${PY_LIB} -DPYTHON_INCLUDE_DIR=${PY_INC} -DBoost_NO_BOOST_CMAKE=ON; fi
 # make with RelWithDebInfo to have high optimization with asserts on
 cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo ../ 
 VERBOSE=1 make
@@ -26,7 +25,7 @@ cd ..
 # make libcloudph++ in Debug mode
 sudo rm -rf libcloudphxx/build/*
 cd libcloudphxx/build
-if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cmake .. -DPYTHON_LIBRARY=${PY_LIB} -DPYTHON_INCLUDE_DIR=${PY_INC}; fi
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cmake .. -DPYTHON_LIBRARY=${PY_LIB} -DPYTHON_INCLUDE_DIR=${PY_INC} -DBoost_NO_BOOST_CMAKE=ON; fi
 cmake -DCMAKE_BUILD_TYPE=Debug ../
 VERBOSE=1 make
 sudo make install

.travis_scripts/tests.sh

@@ -5,7 +5,7 @@ set -ex
 mkdir build 
 cd build
 # if [[ $TRAVIS_OS_NAME == 'linux' && $CXX == 'clang++' ]]; then cmake ../; fi 
-if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cmake .. -DPYTHON_LIBRARY=${PY_LIB} -DPYTHON_INCLUDE_DIR=${PY_INC}; fi
+if [[ $TRAVIS_OS_NAME == 'osx' ]]; then cmake .. -DPYTHON_LIBRARY=${PY_LIB} -DPYTHON_INCLUDE_DIR=${PY_INC} -DBoost_NO_BOOST_CMAKE=ON; fi
 cmake -DCMAKE_BUILD_TYPE=Debug ../
 VERBOSE=1 make
 OMP_NUM_THREADS=4 make test || cat Testing/Temporary/LastTest.log / # "/" intentional! (just to make cat exit with an error code)

bindings/python/CMakeLists.txt

@@ -15,8 +15,10 @@ target_link_libraries(cloudphxx ${PYTHON_LIBRARIES})
 
 # informing the Python bindings where to find Boost.Python 
 if(${Boost_MINOR_VERSION} LESS 67)
+  message(STATUS "boost python as python")
   find_package(Boost COMPONENTS python)
 else()
+  message(STATUS "boost python as python27")
   find_package(Boost COMPONENTS python27)
 endif()
 if (NOT Boost_FOUND)
@@ -29,11 +31,14 @@ target_link_libraries(cloudphxx ${Boost_LIBRARIES})
 
 # boost python 1.65.0 replaced the booost::python::numeric API with boost::python::numpy
 if(${Boost_MINOR_VERSION} LESS 65)
+  message(STATUS "boost numpy as DBPNUMERIC")
   target_compile_options(cloudphxx PRIVATE -DBPNUMERIC)
 else()
   if(${Boost_MINOR_VERSION} LESS 67)
+    message(STATUS "boost numpy as numpy")
     find_package(Boost COMPONENTS numpy REQUIRED)
   else()
+    message(STATUS "boost numpy as numpy27")
     find_package(Boost COMPONENTS numpy27 REQUIRED)
   endif()
   target_link_libraries(cloudphxx ${Boost_LIBRARIES})