Index: openacs-4/packages/accounts-finance/tcl/energy-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/accounts-finance/tcl/energy-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/accounts-finance/tcl/energy-procs.tcl 28 May 2010 06:35:03 -0000 1.1 +++ openacs-4/packages/accounts-finance/tcl/energy-procs.tcl 22 Jun 2010 20:03:29 -0000 1.2 @@ -12,13 +12,13 @@ year intervals_per_year } { - returns the system energy output within an interval + Returns the system energy output within an interval. Unit returned is in kWh if these units are used: - base_system_performance (hours of available peak energy / year or kWh/kW ) - peak_power_output ( kW ) - annual_degredation ( percent expressed as a decimal number ) 10% is 0.1 + base_system_performance (hours of available peak energy / year or kWh/kW ), + peak_power_output ( kW ), + annual_degredation ( percent expressed as a decimal number ). Ten percent is represented as 0.1 } { - set energy_output [expr { $base_system_performance * $peak_power_output * ( 1. - (( $year - 1. ) * $annual_degredation ) ) / double($periods_per_year) } ] + set energy_output [expr { $base_system_performance * $peak_power_output * ( 1. - (( $year - 1. ) * $annual_degredation ) ) / double( $intervals_per_year ) } ] return $energy_output }