Merge branch 'barnhark/update_testing_proceedures' into barnhark/rockblock

Author: kbarnhart

.travis.yml

@@ -38,18 +38,21 @@ install:
   if [[ "$TRAVIS_BRANCH" == "release" ]]; then
     conda install landlab -c landlab
   else
+    pwd
+    cd ../..
     git clone --depth=50 https://github.com/landlab/landlab.git landlab/landlab
     cd landlab/landlab
     git fetch origin master
     git checkout -qf master
     git submodule update --init --recursive
     conda install --file=requirements.txt
     python setup.py develop
-    cd ../..
+    cd ../../landlab/tutorials
   fi
 - conda install jupyter dask holoviews pytest
 - conda info -a && conda list
 script:
-- pytest
+- pwd
+- travis_wait 50 pytest # the cellular atomata test takes over 10 minutes, and the entire process takes about 30 minutes, so we'll give it 50 min
 virtualenv:
   system_site_packages: false

ecohydrology/cellular_automaton_vegetation_flat_surface/Ecohyd_functions_flat.py

@@ -111,7 +111,7 @@ def Empty_arrays(n, grid, grid1):
     Time = np.empty(n)  # To record time elapsed from the start of simulation
 #    CumWaterStress = np.empty([n/55, grid1.number_of_cells])
     # Cum Water Stress
-    VegType = np.empty([n/55, grid1.number_of_cells], dtype=int)
+    VegType = np.empty([int(n/55), grid1.number_of_cells], dtype=int)
     PET_ = np.zeros([365, grid.number_of_cells])
     Rad_Factor = np.empty([365, grid.number_of_cells])
     EP30 = np.empty([365, grid.number_of_cells])
@@ -187,9 +187,7 @@ def Plot_(grid, VegType, yrs, yr_step=10):
     pic += 1
     plt.figure(pic)
     plt.plot(years, grass_cov, '-g', label='Grass')
-    plt.hold(True)
     plt.plot(years, shrub_cov, '-r', label='Shrub')
-    plt.hold(True)
     plt.plot(years, tree_cov, '-k', label='Tree')
     plt.ylabel(' % Coverage ')
     plt.xlabel('Time in years')