search

AmericasWater / awash

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

Distinguish between agricultural timesteps (years) and normal timesteps #20

Closed jrising closed 5 years ago

jrising commented 7 years ago

New year index, used by agriculture. Still allows totalirrigation to be at timestep level.

jrising commented 5 years ago

This is a pretty big commit, since it includes both updates for Julia 0.6, and associated data file changes, and the agricultural year (called "harvestyear") timestep logic, and associated irrigation calculation changes. I think the main question is if you have any philosophical objections to having agriculture only computed once per year. If not, I'd like to merge it, and move on to either updating to Julia 1.0 or adding the energy system.

jrising commented 5 years ago

Note: master commit prior to merge: b0f26b56d2fc3a4b817267c1d46f5049364f1cf9