Added extra GDX output for temporary testing
Corrected SA export reporting and subsidies reporting
Corrected issue related to choice between DIS and FLW from reservoirs