Merge branch 'exp/REC-twitter' of github.com:davemfish/invest into ex…

…p/REC-twitter

scripts/recreation_server/copy_quadtree_to_gcs.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+#SBATCH --time=2:00:00
+#SBATCH --ntasks=1
+#SBATCH --cpus-per-task=1
+#SBATCH --mem-per-cpu=4000M
+#SBATCH --mail-type=ALL
+#SBATCH --mail-user=davefisher@stanford.edu
+#SBATCH --partition=hns,normal
+#SBATCH --output=/scratch/users/dfisher5/slurm-logfiles/slurm-%j.%x.out
+
+ml load system rclone
+rclone copy --progress \
+    $SCRATCH/twitter_quadtree/ \
+    gcs-remote:natcap-recreation/twitter_quadtree/

src/natcap/invest/recreation/out_of_core_quadtree.pyx

@@ -265,7 +265,7 @@ class OutOfCoreQuadTree(object):
         return sum([self.nodes[index].n_nodes() for index in xrange(4)]) + 1
 
     def n_points(self):
-        """Return the number of nodes in the quadtree"""
+        """Return the number of points in the quadtree"""
         if self.is_leaf:
             return self.n_points_in_node
         return sum([self.nodes[index].n_points() for index in xrange(4)])