Merge divergent versions of power-plant branch

JGCRI / cassandra

Human-earth system multi-scale model coupling framework

Other

6 stars 3 forks source link

Merge divergent versions of power-plant branch #5

Closed rplzzz closed 9 years ago

rplzzz commented 9 years ago

These two branches have grown a little bit apart. We need to reconcile them. Most likely we will do this manually and then close the PR when it's done.

rplzzz commented 9 years ago

I have updated the test code to run with the changes I've made on this branch. Here is the expected output, for testing purposes after the merge.

#Water usage proxy grid: column, row, water value
661,115,2640.0
663,113,600.0
239,113,1150.0