Skip to content

Commit

Permalink
Update hybrid metrics tables per NREL/ssc#1056
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjanzou
sjanzou committed Oct 30, 2023
1 parent 63cf2d0 commit 3ce9a9a
Showing 1 changed file with 4 additions and 12 deletions.
16 changes: 4 additions & 12 deletions deploy/runtime/metrics.lk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,6 @@ metrics{ 'PVWatts Wind Battery Hybrid|Single Owner'} = define() {
metric_row( 'wind_annual_energy', {'label'='Wind', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'wind_capacity_factor', {'label'='Wind AC capacity factor', 'mode'='f', 'deci'='1', 'thousep'='true', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'wind_kwh_per_kw', {'label'='Wind energy yield', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh/kW', 'tableName'='SubsystemTable' } );
metric_row( 'battery_annual_energy', {'label'='Battery', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_average_battery_roundtrip_efficiency', {'label'='Battery roundtrip efficiency', 'mode'='f', 'deci'='2', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'battery_batt_system_charge_percent', {'label'='Battery charge energy from system', 'mode'='f', 'deci'='1', 'thousep'='false', 'post'='%', 'tableName'='SubsystemTable' } );
};
Expand All @@ -632,7 +631,6 @@ metrics{ 'PVWatts Wind Battery Hybrid|Host Developer'} = define() {
metric_row( 'wind_annual_energy', {'label'='Wind', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'wind_capacity_factor', {'label'='Wind AC capacity factor', 'mode'='f', 'deci'='1', 'thousep'='true', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'wind_kwh_per_kw', {'label'='Wind energy yield', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh/kW', 'tableName'='SubsystemTable' } );
metric_row( 'battery_annual_energy', {'label'='Battery', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_average_battery_roundtrip_efficiency', {'label'='Battery roundtrip efficiency', 'mode'='f', 'deci'='2', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'battery_batt_system_charge_percent', {'label'='Battery charge energy from system', 'mode'='f', 'deci'='1', 'thousep'='false', 'post'='%', 'tableName'='SubsystemTable' } );
};
Expand All @@ -648,8 +646,7 @@ metrics{ 'PVWatts Wind FuelCell Battery Hybrid|Single Owner'} = define() {
metric_row( 'wind_annual_energy', {'label'='Wind', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'wind_capacity_factor', {'label'='Wind AC capacity factor', 'mode'='f', 'deci'='1', 'thousep'='true', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'wind_kwh_per_kw', {'label'='Wind energy yield', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh/kW', 'tableName'='SubsystemTable' } );
metric_row( 'fuelcell_annual_energy', {'label'='Fuel cell', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_annual_energy', {'label'='Battery', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'fuelcell_annual_energy_discharged', {'label'='Fuel cell', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_average_battery_roundtrip_efficiency', {'label'='Battery roundtrip efficiency', 'mode'='f', 'deci'='2', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'battery_batt_system_charge_percent', {'label'='Battery charge energy from system', 'mode'='f', 'deci'='1', 'thousep'='false', 'post'='%', 'tableName'='SubsystemTable' } );
};
Expand All @@ -664,8 +661,7 @@ metrics{ 'PVWatts Wind FuelCell Battery Hybrid|Host Developer'} = define() {
metric_row( 'wind_annual_energy', {'label'='Wind', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'wind_capacity_factor', {'label'='Wind AC capacity factor', 'mode'='f', 'deci'='1', 'thousep'='true', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'wind_kwh_per_kw', {'label'='Wind energy yield', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh/kW', 'tableName'='SubsystemTable' } );
metric_row( 'fuelcell_annual_energy', {'label'='Fuel cell', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_annual_energy', {'label'='Battery', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'fuelcell_annual_energy_discharged', {'label'='Fuel cell', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_average_battery_roundtrip_efficiency', {'label'='Battery roundtrip efficiency', 'mode'='f', 'deci'='2', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'battery_batt_system_charge_percent', {'label'='Battery charge energy from system', 'mode'='f', 'deci'='1', 'thousep'='false', 'post'='%', 'tableName'='SubsystemTable' } );
};
Expand All @@ -681,7 +677,6 @@ metrics{ 'Photovoltaic Wind Battery Hybrid|Single Owner'} = define() {
metric_row( 'wind_annual_energy', {'label'='Wind', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'wind_capacity_factor', {'label'='Wind AC capacity factor', 'mode'='f', 'deci'='1', 'thousep'='true', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'wind_kwh_per_kw', {'label'='Wind energy yield', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh/kW', 'tableName'='SubsystemTable' } );
metric_row( 'battery_annual_energy', {'label'='Battery', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_average_battery_roundtrip_efficiency', {'label'='Battery roundtrip efficiency', 'mode'='f', 'deci'='2', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'battery_batt_system_charge_percent', {'label'='Battery charge energy from system', 'mode'='f', 'deci'='1', 'thousep'='false', 'post'='%', 'tableName'='SubsystemTable' } );
};
Expand All @@ -696,7 +691,6 @@ metrics{ 'Photovoltaic Wind Battery Hybrid|Host Developer'} = define() {
metric_row( 'wind_annual_energy', {'label'='Wind', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'wind_capacity_factor', {'label'='Wind AC capacity factor', 'mode'='f', 'deci'='1', 'thousep'='true', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'wind_kwh_per_kw', {'label'='Wind energy yield', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh/kW', 'tableName'='SubsystemTable' } );
metric_row( 'battery_annual_energy', {'label'='Battery', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_average_battery_roundtrip_efficiency', {'label'='Battery roundtrip efficiency', 'mode'='f', 'deci'='2', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'battery_batt_system_charge_percent', {'label'='Battery charge energy from system', 'mode'='f', 'deci'='1', 'thousep'='false', 'post'='%', 'tableName'='SubsystemTable' } );
};
Expand All @@ -715,8 +709,7 @@ metrics{ 'Generic PVWatts Wind FuelCell Battery Hybrid|Single Owner'} = define(
metric_row( 'wind_annual_energy', {'label'='Wind', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'wind_capacity_factor', {'label'='Wind AC capacity factor', 'mode'='f', 'deci'='1', 'thousep'='true', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'wind_kwh_per_kw', {'label'='Wind energy yield', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh/kW', 'tableName'='SubsystemTable' } );
metric_row( 'fuelcell_annual_energy', {'label'='Fuel cell', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_annual_energy', {'label'='Battery', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'fuelcell_annual_energy_discharged', {'label'='Fuel cell', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_average_battery_roundtrip_efficiency', {'label'='Battery roundtrip efficiency', 'mode'='f', 'deci'='2', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'battery_batt_system_charge_percent', {'label'='Battery charge energy from system', 'mode'='f', 'deci'='1', 'thousep'='false', 'post'='%', 'tableName'='SubsystemTable' } );
};
Expand All @@ -734,8 +727,7 @@ metrics{ 'Generic PVWatts Wind FuelCell Battery Hybrid|Host Developer'} = defin
metric_row( 'wind_annual_energy', {'label'='Wind', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'wind_capacity_factor', {'label'='Wind AC capacity factor', 'mode'='f', 'deci'='1', 'thousep'='true', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'wind_kwh_per_kw', {'label'='Wind energy yield', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh/kW', 'tableName'='SubsystemTable' } );
metric_row( 'fuelcell_annual_energy', {'label'='Fuel cell', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_annual_energy', {'label'='Battery', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'fuelcell_annual_energy_discharged', {'label'='Fuel cell', 'mode'='f', 'deci'='0', 'thousep'='true', 'post'=' kWh', 'tableName'='SubsystemTable' } );
metric_row( 'battery_average_battery_roundtrip_efficiency', {'label'='Battery roundtrip efficiency', 'mode'='f', 'deci'='2', 'post'='%', 'tableName'='SubsystemTable' } );
metric_row( 'battery_batt_system_charge_percent', {'label'='Battery charge energy from system', 'mode'='f', 'deci'='1', 'thousep'='false', 'post'='%', 'tableName'='SubsystemTable' } );
};

0 comments on commit 3ce9a9a

Please sign in to comment.