Add full list of GenX input columns
Many of these columns will be blank and some aren't necessary.
Gives a good idea of what data is populated and what
still needs to be done.
@@ -1906,7 +1906,67 @@ class GeneratorClusters:
f"Capacity of {self.results['Existing_Cap_MW'].sum()} MW in final clusters"
)
+ col_order = [
+ "cluster",
+ "R_ID",
+ "zone",
+ "voltage_level",
+ "THERM",
+ "DISP",
+ "NDISP",
+ "STOR",
+ "DR",
+ "HEAT",
+ "NACC",
+ "HYDRO",
+ "VRE",
+ "Commit",
+ "Min_Share",
+ "Max_Share",
+ "Existing_Cap_MW",
+ "New_Build",
+ "Cap_size",
+ "Min_Cap_MW",
+ "Max_Cap_MW",
+ "Min_Share_percent",
+ "Max_Share_percent",
+ "Inv_cost_per_MWyr",
+ "Fixed_OM_cost_per_MWyr",
+ "Inv_cost_per_MWhyr",
+ "Fixed_OM_cost_per_MWhyr",
+ "Var_OM_cost_per_MWh",
+ "Var_OM_cost_per_MWh_in",
+ "Externality_cost_MWh",
+ "Start_cost",
+ "Start_fuel_MMBTU_per_MW",
+ "Start_fuel_MMBTU_per_start",
+ "Heat_rate_MMBTU_per_MWh",
+ "heat_rate_mmbtu_mwh_iqr",
+ "heat_rate_mmbtu_mwh_std",
+ "Fuel",
+ "Min_power",
+ "Self_disch",
+ "Eff_up",
+ "Eff_down",
+ "Ratio_power_to_energy",
+ "Min_Duration",
+ "Max_Duration",
+ "Max_DSM_delay",
+ "Ramp_Up_percentage",
+ "Ramp_Dn_percentage",
+ "Up_time",
+ "Down_time",
+ "NACC_Eff",
+ "NACC_Peak_to_Base",
+ "Reg_Up",
+ "Reg_Dn",
+ "Rsv_Up",
+ "Rsv_Dn",
+ "Reg_Cost",
+ "Rsv_Cost",
+ ]
+
if return_retirement_capacity:
return self.results, self.retired
else:
- return self.results
+ return self.results.reindex(columns=col_order)
