Fix issues with single tech configurations and ResultsViewer::Setup

NREL · Jul 19, 2023 · 5edfba2 · 5edfba2
1 parent 69adf84
commit 5edfba2
Show file tree

Hide file tree

Showing 54 changed files with 291 additions and 282 deletions.
diff --git a/api/api_autogen/library/defaults/Battery_FuelCellCommercial.json b/api/api_autogen/library/defaults/Battery_FuelCellCommercial.json
diff --git a/api/api_autogen/library/defaults/Battery_FuelCellSingleOwner.json b/api/api_autogen/library/defaults/Battery_FuelCellSingleOwner.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Battery_GenericBatteryAllEquityPartnershipFlip.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryCommercial.json b/api/api_autogen/library/defaults/Battery_GenericBatteryCommercial.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryHostDeveloper.json b/api/api_autogen/library/defaults/Battery_GenericBatteryHostDeveloper.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Battery_GenericBatteryLeveragedPartnershipFlip.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryMerchantPlant.json b/api/api_autogen/library/defaults/Battery_GenericBatteryMerchantPlant.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryResidential.json b/api/api_autogen/library/defaults/Battery_GenericBatteryResidential.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatterySaleLeaseback.json b/api/api_autogen/library/defaults/Battery_GenericBatterySaleLeaseback.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatterySingleOwner.json b/api/api_autogen/library/defaults/Battery_GenericBatterySingleOwner.json
diff --git a/api/api_autogen/library/defaults/Battery_GenericBatteryThirdParty.json b/api/api_autogen/library/defaults/Battery_GenericBatteryThirdParty.json
diff --git a/api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json b/api/api_autogen/library/defaults/Battery_MEwaveBatterySingleOwner.json
diff --git a/api/api_autogen/library/defaults/HostDeveloper_FlatPlatePVHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_FlatPlatePVHostDeveloper.json
@@ -291,6 +291,8 @@
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/HostDeveloper_GenericBatteryHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_GenericBatteryHostDeveloper.json
@@ -306,6 +306,8 @@
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/HostDeveloper_GenericSystemHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_GenericSystemHostDeveloper.json
@@ -293,6 +293,8 @@
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/HostDeveloper_PVBatteryHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_PVBatteryHostDeveloper.json
@@ -304,6 +304,8 @@
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/HostDeveloper_PVWattsBatteryHostDeveloper.json b/api/api_autogen/library/defaults/HostDeveloper_PVWattsBatteryHostDeveloper.json
@@ -291,6 +291,8 @@
 		},
 		"ElectricityRates": {
 			"rate_escalation": [0.000000]
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Pvwattsv8_FuelCellCommercial.json b/api/api_autogen/library/defaults/Pvwattsv8_FuelCellCommercial.json
@@ -56,8 +56,6 @@
 				[0.000000]
 			],
 			"adjust_timeindex": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
-		},
-		"HybridTech": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Pvwattsv8_FuelCellSingleOwner.json b/api/api_autogen/library/defaults/Pvwattsv8_FuelCellSingleOwner.json
@@ -56,8 +56,6 @@
 				[0.000000]
 			],
 			"adjust_timeindex": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
-		},
-		"HybridTech": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsBatteryCommercial.json b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsBatteryCommercial.json
diff --git a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsBatteryHostDeveloper.json b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsBatteryHostDeveloper.json
diff --git a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsBatteryResidential.json b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsBatteryResidential.json
diff --git a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsBatteryThirdParty.json b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsBatteryThirdParty.json
diff --git a/api/api_autogen/library/defaults/Pvwattsv8_PVWattsNone.json b/api/api_autogen/library/defaults/Pvwattsv8_PVWattsNone.json
diff --git a/api/api_autogen/library/defaults/Singleowner_BiopowerSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_BiopowerSingleOwner.json
@@ -285,6 +285,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_DSLFSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_DSLFSingleOwner.json
@@ -284,6 +284,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_ETESSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_ETESSingleOwner.json
@@ -275,6 +275,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_EmpiricalTroughSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_EmpiricalTroughSingleOwner.json
@@ -284,6 +284,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_FlatPlatePVSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_FlatPlatePVSingleOwner.json
@@ -284,6 +284,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_FuelCellSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_FuelCellSingleOwner.json
@@ -305,6 +305,8 @@
 			"battery_total_cost_lcos": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_GenericBatterySingleOwner.json b/api/api_autogen/library/defaults/Singleowner_GenericBatterySingleOwner.json
@@ -297,6 +297,8 @@
 			"battery_total_cost_lcos": 8.38445e+07
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_GenericCSPSystemSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_GenericCSPSystemSingleOwner.json
@@ -284,6 +284,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_GenericSystemSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_GenericSystemSingleOwner.json
@@ -283,6 +283,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_GeothermalPowerSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_GeothermalPowerSingleOwner.json
@@ -281,6 +281,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_HighXConcentratingPVSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_HighXConcentratingPVSingleOwner.json
@@ -282,6 +282,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_MEwaveBatterySingleOwner.json b/api/api_autogen/library/defaults/Singleowner_MEwaveBatterySingleOwner.json
@@ -293,6 +293,8 @@
 			"battery_total_cost_lcos": 8.29056e+06
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_MEwaveSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_MEwaveSingleOwner.json
@@ -274,6 +274,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_MSLFSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_MSLFSingleOwner.json
@@ -284,6 +284,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_MSPTSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_MSPTSingleOwner.json
@@ -282,6 +282,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_PTESSingleOwner.json b/api/api_autogen/library/defaults/Singleowner_PTESSingleOwner.json
@@ -275,6 +275,8 @@
 			"batt_salvage_percentage": 0
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Singleowner_PVBatterySingleOwner.json b/api/api_autogen/library/defaults/Singleowner_PVBatterySingleOwner.json
@@ -298,6 +298,8 @@
 			"battery_total_cost_lcos": 8.79537e+07
 		},
 		"ChargesByMonth": {
+		},
+		"HybridFin": {
 		}
 	}
 }
diff --git a/api/api_autogen/library/defaults/Windpower_WindPowerNone.json b/api/api_autogen/library/defaults/Windpower_WindPowerNone.json
@@ -78,8 +78,6 @@
 		},
 		"Uncertainty": {
 			"total_uncert": 12.085
-		},
-		"HybridTech": {
 		}
 	}
 }
diff --git a/api/include/SAM_Battery.h b/api/include/SAM_Battery.h
@@ -1710,19 +1710,6 @@ extern "C"
 	SAM_EXPORT void SAM_Battery_GridLimits_grid_interconnection_limit_kwac_nset(SAM_table ptr, double number, SAM_error *err);
 
 
-	//
-	// HybridTech parameters
-	//
-
-	/**
-	 * Set is_hybrid: hybrid configuration [0/1]
-	 * options: 0=singletech,1=hybrid
-	 * constraints: None
-	 * required if: ?=0
-	 */
-	SAM_EXPORT void SAM_Battery_HybridTech_is_hybrid_nset(SAM_table ptr, double number, SAM_error *err);
-
-
 	/**
 	 * Simulation Getters
 	 */
@@ -2200,13 +2187,6 @@ extern "C"
 	SAM_EXPORT double SAM_Battery_GridLimits_grid_interconnection_limit_kwac_nget(SAM_table ptr, SAM_error *err);
 
 
-	/**
-	 * HybridTech Getters
-	 */
-
-	SAM_EXPORT double SAM_Battery_HybridTech_is_hybrid_nget(SAM_table ptr, SAM_error *err);
-
-
 	/**
 	 * Outputs Getters
 	 */
@@ -2341,6 +2321,8 @@ extern "C"
 
 	SAM_EXPORT double* SAM_Battery_Outputs_cdf_of_surviving_aget(SAM_table ptr, int* length, SAM_error *err);
 
+	SAM_EXPORT double* SAM_Battery_Outputs_cf_battery_replacement_cost_schedule_aget(SAM_table ptr, int* length, SAM_error *err);
+
 	SAM_EXPORT double* SAM_Battery_Outputs_cf_energy_net_aget(SAM_table ptr, int* length, SAM_error *err);
 
 	SAM_EXPORT double* SAM_Battery_Outputs_cf_om_capacity_aget(SAM_table ptr, int* length, SAM_error *err);

diff --git a/api/include/SAM_HostDeveloper.h b/api/include/SAM_HostDeveloper.h
@@ -2421,6 +2421,19 @@ extern "C"
 	SAM_EXPORT void SAM_HostDeveloper_ElectricityRates_rate_escalation_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
 
 
+	//
+	// HybridFin parameters
+	//
+
+	/**
+	 * Set cf_hybrid_om_sum: Hybrid O&M costs [$]
+	 * options: None
+	 * constraints: None
+	 * required if: None
+	 */
+	SAM_EXPORT void SAM_HostDeveloper_HybridFin_cf_hybrid_om_sum_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
+
+
 	/**
 	 * Revenue Getters
 	 */
@@ -3087,6 +3100,13 @@ extern "C"
 	SAM_EXPORT double* SAM_HostDeveloper_ElectricityRates_rate_escalation_aget(SAM_table ptr, int* length, SAM_error *err);
 
 
+	/**
+	 * HybridFin Getters
+	 */
+
+	SAM_EXPORT double* SAM_HostDeveloper_HybridFin_cf_hybrid_om_sum_aget(SAM_table ptr, int* length, SAM_error *err);
+
+
 	/**
 	 * Outputs Getters
 	 */

diff --git a/api/include/SAM_Pvwattsv8.h b/api/include/SAM_Pvwattsv8.h
@@ -404,19 +404,6 @@ extern "C"
 	SAM_EXPORT void SAM_Pvwattsv8_AdjustmentFactors_adjust_timeindex_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
 
 
-	//
-	// HybridTech parameters
-	//
-
-	/**
-	 * Set is_hybrid: hybrid configuration [0/1]
-	 * options: 0=singletech,1=hybrid
-	 * constraints: None
-	 * required if: ?=0
-	 */
-	SAM_EXPORT void SAM_Pvwattsv8_HybridTech_is_hybrid_nset(SAM_table ptr, double number, SAM_error *err);
-
-
 	/**
 	 * SolarResource Getters
 	 */
@@ -530,13 +517,6 @@ extern "C"
 	SAM_EXPORT double* SAM_Pvwattsv8_AdjustmentFactors_adjust_timeindex_aget(SAM_table ptr, int* length, SAM_error *err);
 
 
-	/**
-	 * HybridTech Getters
-	 */
-
-	SAM_EXPORT double SAM_Pvwattsv8_HybridTech_is_hybrid_nget(SAM_table ptr, SAM_error *err);
-
-
 	/**
 	 * Outputs Getters
 	 */
@@ -563,6 +543,8 @@ extern "C"
 
 	SAM_EXPORT double SAM_Pvwattsv8_Outputs_capacity_factor_ac_nget(SAM_table ptr, SAM_error *err);
 
+	SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_battery_replacement_cost_schedule_aget(SAM_table ptr, int* length, SAM_error *err);
+
 	SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_energy_net_aget(SAM_table ptr, int* length, SAM_error *err);
 
 	SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_om_capacity_aget(SAM_table ptr, int* length, SAM_error *err);