From 5afd849490809a412cfb492f74ccf9b6d45dd0da Mon Sep 17 00:00:00 2001 From: Matt Prilliman Date: Thu, 16 Nov 2023 10:27:01 -0600 Subject: [PATCH] Fix dependencies on hybrids, update tests --- ...atts Wind FuelCell Battery Hybrid_Single Owner.json | 8 ++++---- deploy/runtime/startup.lk | 4 ++-- test_results_win64.csv | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json index e75d18496f..9faf12d13c 100644 --- a/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json +++ b/deploy/runtime/defaults/PVWatts Wind FuelCell Battery Hybrid_Single Owner.json @@ -2077,7 +2077,6 @@ "permitting_per_fckw": 0.0, "permitting_percent": 0.0, "permitting_total": 0.0, - "pv_ui_step_minutes": 0.0, "sales_tax_percent": 100.0, "sales_tax_rate": 5.0, "sales_tax_total": 100000.0, @@ -2085,8 +2084,7 @@ "subtotal_direct": 2000000.0, "total_direct_cost": 2000000.0, "total_indirect_cost": 0.0, - "total_installed_cost": 2100000.0, - "wind_ui_step_minutes": 0.0 + "total_installed_cost": 2100000.0 }, "Battery": { "LeadAcid_q10": 93.0, @@ -12632,6 +12630,7 @@ "pv.storage.p6.discharge": 0.0, "pv.storage.p6.dischargetogrid": 0.0, "pv.storage.p6.gridcharge": 0.0, + "pv_ui_step_minutes": 0.0, "sales_tax_rate": 5.0, "solar_resource_file": "phoenix_az_33.450495_-111.983688_psmv3_60_tmy.csv", "system_capacity": 57600.0, @@ -12644,7 +12643,8 @@ "ui_copy_batt_discharge_percent_3": 25.0, "ui_copy_batt_discharge_percent_4": 25.0, "ui_copy_batt_discharge_percent_5": 25.0, - "ui_copy_batt_discharge_percent_6": 25.0 + "ui_copy_batt_discharge_percent_6": 25.0, + "wind_ui_step_minutes": 0.0 }, "Hybrid": { "ac_nameplate": 71428.6, diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk index 00a0b00d81..1cbcf13024 100644 --- a/deploy/runtime/startup.lk +++ b/deploy/runtime/startup.lk @@ -2720,8 +2720,8 @@ sethybridvariabledependencies([ { 'IndependentVartableIndex' = 0,'IndependentVariableName' = 'ac_nameplate', 'DependentVartableIndex' = 4,'DependentVariableName' = 'ac_nameplate'}, { 'IndependentVartableIndex' = 0,'IndependentVariableName' = 'solar_resource_file', 'DependentVartableIndex' = 3,'DependentVariableName' = 'solar_resource_file'}, // battery dispatch { 'IndependentVartableIndex' = 0,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 4,'DependentVariableName' = 'pv_total_installed_cost'}, -{ 'IndependentVartableIndex' = 0,'IndependentVariableName' = 'ui_step_minutes', 'DependentVartableIndex' = 2,'DependentVariableName' = 'pv_ui_step_minutes'}, // pv smoothing dispatch -{ 'IndependentVartableIndex' = 1,'IndependentVariableName' = 'ui_step_minutes', 'DependentVartableIndex' = 2,'DependentVariableName' = 'wind_ui_step_minutes'}, // pv smoothing dispatch +{ 'IndependentVartableIndex' = 0,'IndependentVariableName' = 'ui_step_minutes', 'DependentVartableIndex' = 3,'DependentVariableName' = 'pv_ui_step_minutes'}, // pv smoothing dispatch +{ 'IndependentVartableIndex' = 1,'IndependentVariableName' = 'ui_step_minutes', 'DependentVartableIndex' = 3,'DependentVariableName' = 'wind_ui_step_minutes'}, // pv smoothing dispatch { 'IndependentVartableIndex' = 1,'IndependentVariableName' = 'system_capacity', 'DependentVartableIndex' = 4,'DependentVariableName' = 'wind_system_capacity'}, { 'IndependentVartableIndex' = 1,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 4,'DependentVariableName' = 'wind_total_installed_cost'}, { 'IndependentVartableIndex' = 2,'IndependentVariableName' = 'fuelcell_power_nameplate', 'DependentVartableIndex' = 4,'DependentVariableName' = 'fuelcell_power_nameplate'}, // fuel cell costs hybrid diff --git a/test_results_win64.csv b/test_results_win64.csv index d578d744ed..f021e3399c 100644 --- a/test_results_win64.csv +++ b/test_results_win64.csv @@ -60,8 +60,8 @@ Standalone Battery,Merchant Plant,-8397703,25.7208,NA,; Warning: IRR at end of a Standalone Battery,Leveraged Partnership Flip,-8397703,88.8253,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.06575e+06. A negative NPV indicates project costs are higher than revenues. Standalone Battery,All Equity Partnership Flip,-8397703,91.211,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: IRR in target year is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-1.63501e+07. A negative NPV indicates project costs are higher than revenues. Standalone Battery,Sale Leaseback,-8397703,92.007,88.6283,; Warning: IRR at end of analysis period is not a number (NaN). This can indicate that revenues are too low to cover costs, or that they are excessively high compared to costs. Warning: NPV is $-2.09729e+07. A negative NPV indicates project costs are higher than revenues. Warning: NPV is $-1.09522e+08. A negative NPV indicates project costs are higher than revenues. -ETES,Single Owner,-467460224,13.312,7.40261,; -PTES,Single Owner,-197586480,16.8906,10.3673,; +ETES,Single Owner,-467019776,13.3214,7.40322,; +PTES,Single Owner,-197589968,16.8909,10.3673,; Physical Trough,Single Owner,376952608,12.1978,12.3469,; Physical Trough,Merchant Plant,376952608,12.8693,NA,; Physical Trough,Leveraged Partnership Flip,376952608,12.4668,12.3469,; @@ -116,8 +116,8 @@ MEwave,Single Owner,65589748,55.4156,60.3986,; MEwave,LCOE Calculator,59434320,NA,NA,; MEwave,None,594343,NA,NA,; MEwave Battery,Single Owner,64959432,57.2866,60.3968,; -MEtidal,LCOE Calculator,fail,fail,fail -MEtidal,None,fail,fail,fail +MEtidal,LCOE Calculator,2.16152e+06,NA,NA,; +MEtidal,None,2.16152e+06,NA,NA,; Wind Power,Residential,48358.4,18.6056,NA,; Wind Power,Commercial,327922,7.10791,NA,; Wind Power,Single Owner,818888256,2.30796,4.33226,; @@ -160,7 +160,7 @@ Generic System,LCOE Calculator,756864000,NA,NA,; Generic System,None,756864000,NA,NA,; PVWatts Wind Battery Hybrid,Single Owner,1030795712,5.79703,6.03805,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. PVWatts Wind Battery Hybrid,Host Developer,1.33543e+06,18.7812,20.2237,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. -PVWatts Wind FuelCell Battery Hybrid,Single Owner,fail,fail,fail +PVWatts Wind FuelCell Battery Hybrid,Single Owner,1031573440,5.89337,4.33035,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. PVWatts Wind FuelCell Battery Hybrid,Host Developer,2.89743e+06,40.8547,42.3062,; Notice: Simulation time step is 60 minutes for pvwattsv8. Notice: Simulation time step is 60 minutes for windpower. Photovoltaic Wind Battery Hybrid,Single Owner,1044608192,4.97264,5.95429,; Notice: Simulation time step is 60 minutes for pvsamv1. Notice: Simulation time step is 60 minutes for windpower. Photovoltaic Wind Battery Hybrid,Host Developer,556023,34.1686,20.2533,; Notice: Simulation time step is 60 minutes for pvsamv1. Notice: Simulation time step is 60 minutes for windpower.