This PR wraps together several changes needed for the functional flows analysis:
It adds elevation output for two that were missing for rim reservoirs (I believe Stanislaus and Upper San Joaquin)
I've added a postprocessing script (./postprocessing/calculate_uncontrolled_spill.py) to calculate uncontrolled spill from rim reservoirs, using the formula:
uncontrolled spill = min(IFR flow - IFR req't - flood control req't, 0),
where "IFR" is the downstream-most IFR.
For the uncontrolled flood script to work, some fiddling with paths is necessary toward the end of the script. These should be obvious (see line 60 & below).
IMPORTANT: The output of this script is a new results file called "UncontrolledSpill_Flow_mcm.csv"
To allow the above postprocessing script to work, this PR also includes:
Change flood control requirement below New Melones (Stanislaus) from IFR to PiecewiseLink.
Add Don Pedro flood release requirement to output.
In addition to these, I also:
Added an option to disaggregate results into different scenario folders, resulting in unidimensional column indices, which is much easier to read in in both R and Python. IMPORTANT: The original scheme remains the default. The disaggregation is changed by setting the disaggregate keyword in the last line in the run_basin_model.py file to True instead of False. (Disaggregate might not be the best word...)
Totally unrelated, I also:
Changed the folder for graphviz schematics to be the basin folders, rather than a separate schematics folder.
This PR wraps together several changes needed for the functional flows analysis:
./postprocessing/calculate_uncontrolled_spill.py
) to calculate uncontrolled spill from rim reservoirs, using the formula:uncontrolled spill = min(IFR flow - IFR req't - flood control req't, 0), where "IFR" is the downstream-most IFR.
For the uncontrolled flood script to work, some fiddling with paths is necessary toward the end of the script. These should be obvious (see line 60 & below).
IMPORTANT: The output of this script is a new results file called "UncontrolledSpill_Flow_mcm.csv"
To allow the above postprocessing script to work, this PR also includes:
In addition to these, I also:
disaggregate
keyword in the last line in the run_basin_model.py file toTrue
instead ofFalse
. (Disaggregate might not be the best word...)Totally unrelated, I also: