Reorder location of SAM variable files and .pow files

Author: ozsolarwind

flexiplot.py~

@@ -78,7 +78,6 @@ scale=True
 ; or can use:      #rrggbb
 background=#00008b
 border=#000000
-fossil_name=#d1d1d1
 grid_boundary=#0000ff
 grid_trace=#00ff0e
 new_grid=#ff007f

siren_default.ini

@@ -32,6 +32,8 @@ grid_stations=<$user1/existing grid stations.xls>
 help=help.html
 ; Hourly load data for grid
 load=<$user1/hourly_$YEAR$_for_sam.csv>
+; Template for Powermatch worksheet
+pm_template=$siren/powermatch_template.xlsx
 ; Location of turbine power curve files for those not in SAM's file
 pow_files=$siren
 ; resource grid file
@@ -78,7 +80,7 @@ scale=True
 ; or can use:      #rrggbb
 background=#00008b
 border=#000000
-fossil_name=#d1d1d1
+cst=#ffcc00
 grid_boundary=#0000ff
 grid_trace=#00ff0e
 new_grid=#ff007f
@@ -88,6 +90,7 @@ station_name=#ffffff
 town=#ff0000
 town_name=#a9a9a9
 ; now for the technologies
+backtrack_pv=#aaaa00
 ;biomass=#45754f
 biomass=#008000
 ;fixed_pv=#fab44c
@@ -105,6 +108,7 @@ tracking_pv=#cccc00
 wave=#4eb397
 ;wind=#55ff00
 wind=#6688bb
+offshore_wind=#6688bb
 ;wave=#335588
 ;efficiency=#777777
 fossil=#000000
@@ -146,25 +150,45 @@ wind50_low=#82b2ff
 [SAM Modules]
 ; The two "financial modules"
 annualoutput_variables=annualoutput_variables.xls
-ippppa_variables=ippppa_variables.xls
+;ippppa_variables=ippppa_variables.xls
+ippppa_variables=ippppa_variables_206.xls
 ; SAM model program to run for biomass stations
 biomass_variables=biomass_variables.xls
 ; SAM model program to run for geothermal stations
-geothermal_variables=geothermal_variables.xls
+;geothermal_variables=geothermal_variables.xls
+geothermal_variables=geothermal_variables_206.xls
 ; SAM model program to run for all PV stations
 pv_variables=pvwattsv5_variables.xls
+; SAM model for generic CST
+cst_variables=tcsgeneric_solar_variables_206.xls
+optical_table=optical_table.csv
 ; SAM model program to run for solar thermal stations
-solar_thermal_variables=tcsmolten_salt_variables.xls
+;solar_thermal_variables=tcsmolten_salt_variables.xls
+solar_thermal_variables=tcsmolten_salt_variables_206.xls
+helio_positions=helio_positions.csv
+;solar_thermal_variables=tcsmolten_salt_variables_45.csv
 ; SAM model program to run for wind stations
 wind_variables=windpower_variables.xls
 ; Details for each of the technologies
+[Backtrack PV]
+area=0.052
+capital_cost=3.38M
+o_m_cost=25K
 [Biomass]
 area=0.001
 capital_cost=4M
 ; fuel cost per tonne
 fuel_cost=50
 multiplier=8.25
 o_m_cost=144K
+[CST]
+; was 3.83 x collector area
+area=0.095
+capital_cost=5.35M
+gross_net=0.87
+o_m_cost=67K
+; hours of storage
+tshours=10
 [Fixed PV]
 area=0.052
 capital_cost=3.38M
@@ -220,7 +244,16 @@ o_m_cost=38K
 capital_cost=5.9M
 o_m_cost=190K
 [Wind]
-area=64
+; area x Number of Turbines x Rotor Diameter squared
+area=64.0
+capital_cost=2.53M
+o_m_cost=45K
+offset_spacing=4
+turbine_spacing=8
+row_spacing=8
+[Offshore Wind]
+; area x Number of Turbines x Rotor Diameter squared
+area=64.0
 capital_cost=2.53M
 o_m_cost=45K
 offset_spacing=4
@@ -229,7 +262,7 @@ row_spacing=8
 [Grid]
 cost_existing=True
 ; dispatchable technologies require "better" transmission line
-dispatchable=pumped_hydro geothermal biomass solar_thermal
+dispatchable=pumped_hydro geothermal biomass solar_thermal cst
 dummy_fix=True
 ; dispatchable transmission line capacities
 d_lines=(250=220_d),(for(n=1,10,(n*1000-500=330_d*n),(n*1000=330_d*n + 330_s)))
@@ -287,7 +320,7 @@ show_load=False
 show_menu=True
 show_pct=False
 summary=False
-technologies=biomass fixed_pv geothermal rooftop_pv solar_thermal tracking_pv wind
+technologies=backtrack_pv biomass cst fixed_pv geothermal offshore_wind rooftop_pv solar_thermal tracking_pv wave wind
 ;pumped_hydro wave
 total=False
 [Financial]