It's getting to be time to merge these, since AWASH is being updated to Julia 0.6, and it's going to be more difficult in the future. I'm opening this PR mainly to give us a sense of the mismatches. The process for merging this work into master, however, should work like this:
The merges should be made one file or one conceptual change at a time.
A new branch should be made off of master, which merges in the Colorado changes, possibly with conditionals that make them only used when the configuration files is set to the Colorado case study (not sure how we should denote this, but we'll take it on a case-by-case basis).
That branch should be checked by Laureline or I and then merged into master, "squashed" to a single commit.
That same commit can then be cherry-pick-ed into uniCO.
It's getting to be time to merge these, since AWASH is being updated to Julia 0.6, and it's going to be more difficult in the future. I'm opening this PR mainly to give us a sense of the mismatches. The process for merging this work into master, however, should work like this:
master, which merges in the Colorado changes, possibly with conditionals that make them only used when the configuration files is set to the Colorado case study (not sure how we should denote this, but we'll take it on a case-by-case basis).master, "squashed" to a single commit.cherry-pick-ed intouniCO.And we iterate until it's done.