feature/demand-flags

[thurber]

add preliminary support in Mosart WRM for reading multiple types of demand files (not yet tested)

[thurber]

@jimyoon here's a draft pull request to add support for the multiple demand files. I wasn't entirely sure how best to describe the various flags, so would appreciate some guidance or commits on my comments!

[jimyoon]

Hi Travis,

Changes look good. I think you might have gotten some of the flags mixed up in your comment (lines 40-48), or I'm not understanding the logic correctly. Made some suggested changes in the text below:

! toggle the types of demand read from files:
! - TotalDemandFlag: if set to 1, demand input is defined for irrigation and non-irrigation sectors. If set to 0, demand input is not distinguished between sectors.
! - GroundwaterFlag: if set to 1, demand input is for both surface water and groundwater (proportions defined in gw_irr and gw_nonirr input files). If set to 0, demand input is for surface water only.
! - ReturnFlowFlag: if set to 1, demand input is for withdrawals and model calculates return flows. If set to 0, demand input is for consumptive use and model assumes no return flows.
! if any of these flags are 1, demand will be read from files with the following suffixes:
! - TotalDemand: _ConNonIrrig & _ConIrrig, or if ReturnFlowFlag = 1, _WithNonIrrig & WithIrrig
!
! - ReturnFlow: _WithIrrig, of if TotalDemand = 1 _WithIrrig & WithNonIrrig
!
! if the GroundwaterFlag is set to 1, additional _gw_irr & _gw_nonirr files will be read in and applied to the demand input files that define a percentage of demand met by gw (_gw_nonirr is 0 if TotalDemandFlag = 0)

[thurber]

@nathalievoisin and @jimyoon, this code appears to be working (producing results that look reasonable to a layperson, for a very short simulation) with all combinations of the TotalDemandFlag, ReturnFlowFlag, and GroundwaterFlag.

I also added back RoutingFlag as an option that can be set in user_nl_mosart - I will just need your help to write a descriptive comment about what it means.