Fix broken PVWatts-Wind-FuelCell-Battery / Single Owner configuration

NREL · Nov 16, 2023 · 2f7b3d4 · 2f7b3d4
1 parent 7e6b738
commit 2f7b3d4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 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
@@ -2075,16 +2075,14 @@
         "permitting_per_fckw": 0.0,
         "permitting_percent": 0.0,
         "permitting_total": 0.0,
-        "pv_system_capacity": 100000.0,
         "sales_tax_percent": 100.0,
         "sales_tax_rate": 5.0,
         "sales_tax_total": 100000.0,
         "sales_tax_value": 5.0,
         "subtotal_direct": 2000000.0,
         "total_direct_cost": 2000000.0,
         "total_indirect_cost": 0.0,
-        "total_installed_cost": 2100000.0,
-        "ui_step_minutes": 60.0
+        "total_installed_cost": 2100000.0
     },
     "Battery": {
         "LeadAcid_q10": 93.0,
@@ -12629,6 +12627,7 @@
         "pv.storage.p6.discharge": 0.0,
         "pv.storage.p6.dischargetogrid": 0.0,
         "pv.storage.p6.gridcharge": 0.0,
+        "pv_system_capacity": 4.0,
         "sales_tax_rate": 5.0,
         "solar_resource_file": "phoenix_az_33.450495_-111.983688_psmv3_60_tmy.csv",
         "system_capacity": 57600.0,
@@ -12641,7 +12640,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,
+        "ui_step_minutes": 0.0
     },
     "Hybrid": {
         "ac_nameplate": 71428.6,

diff --git a/deploy/runtime/startup.lk b/deploy/runtime/startup.lk
@@ -2718,9 +2718,9 @@ setmodules( ['pvwattsv8', 'windpower', 'fuelcell', 'battery', 'grid', 'utilityra
 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' = 'system_capacity', 'DependentVartableIndex' = 2,'DependentVariableName' = 'pv_system_capacity'}, // pv smoothing dispatch
+{ 'IndependentVartableIndex' = 0,'IndependentVariableName' = 'system_capacity', 'DependentVartableIndex' = 3,'DependentVariableName' = 'pv_system_capacity'}, // pv smoothing dispatch
 { 'IndependentVartableIndex' = 0,'IndependentVariableName' = 'total_installed_cost', 'DependentVartableIndex' = 4,'DependentVariableName' = 'pv_total_installed_cost'},
-{ 'IndependentVartableIndex' = 0,'IndependentVariableName' = 'ui_step_minutes', 'DependentVartableIndex' = 2,'DependentVariableName' = 'ui_step_minutes'}, // pv smoothing dispatch
+{ 'IndependentVartableIndex' = 0,'IndependentVariableName' = 'ui_step_minutes', 'DependentVartableIndex' = 3,'DependentVariableName' = '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
@@ -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.