AmericasWater / awash

America's Water AWASH Model
GNU General Public License v3.0
4 stars 6 forks source link

Conjunctiveoptim #21

Closed LaurelineJ closed 7 years ago

LaurelineJ commented 7 years ago

I would like to merge the changes that have been made in the conjunctiveoptim branch.

The branch name is misleading as the later changes have focused on the gw model. It is now possible to have state groundwater model and the simulation is always made at a monthly timestep.

jrising commented 7 years ago

Yeah, the version of DataFrames changed on Travis. You can fix this by merging with master: git merge master (after pulling from master).

jrising commented 7 years ago

I added a bunch of comments. Let me know if you have any questions.

Do we need the file data/gwmodel/v_FIPS.txt? Why not just use global/counties.csv?

jrising commented 7 years ago

I'm going to merge this, so we have it available for everything else!