Merge branch 'hybrids' into paul-hybrid-ui

NREL · Jul 21, 2023 · 68d0e40 · 68d0e40
2 parents 3ba7213 + e7a9f62
commit 68d0e40
Show file tree

Hide file tree

Showing 39 changed files with 1,399 additions and 124 deletions.
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/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/include/SAM_Battery.h b/api/include/SAM_Battery.h
@@ -2321,6 +2321,18 @@ 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);
+
+	SAM_EXPORT double* SAM_Battery_Outputs_cf_om_fixed_aget(SAM_table ptr, int* length, SAM_error *err);
+
+	SAM_EXPORT double* SAM_Battery_Outputs_cf_om_land_lease_aget(SAM_table ptr, int* length, SAM_error *err);
+
+	SAM_EXPORT double* SAM_Battery_Outputs_cf_om_production_aget(SAM_table ptr, int* length, SAM_error *err);
+
 	SAM_EXPORT double* SAM_Battery_Outputs_crit_load_aget(SAM_table ptr, int* length, SAM_error *err);
 
 	SAM_EXPORT double* SAM_Battery_Outputs_crit_load_unmet_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,27 @@ 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);
+
+	/**
+	 * Set is_hybrid: hybrid configuration [0/1]
+	 * options: 0=singletech,1=hybrid
+	 * constraints: None
+	 * required if: ?=0
+	 */
+	SAM_EXPORT void SAM_HostDeveloper_HybridFin_is_hybrid_nset(SAM_table ptr, double number, SAM_error *err);
+
+
 	/**
 	 * Revenue Getters
 	 */
@@ -3087,6 +3108,15 @@ 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);
+
+	SAM_EXPORT double SAM_HostDeveloper_HybridFin_is_hybrid_nget(SAM_table ptr, SAM_error *err);
+
+
 	/**
 	 * Outputs Getters
 	 */

diff --git a/api/include/SAM_Pvwattsv8.h b/api/include/SAM_Pvwattsv8.h
@@ -543,6 +543,18 @@ 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);
+
+	SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_om_fixed_aget(SAM_table ptr, int* length, SAM_error *err);
+
+	SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_om_land_lease_aget(SAM_table ptr, int* length, SAM_error *err);
+
+	SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_om_production_aget(SAM_table ptr, int* length, SAM_error *err);
+
 	SAM_EXPORT const char* SAM_Pvwattsv8_Outputs_city_sget(SAM_table ptr, SAM_error *err);
 
 	SAM_EXPORT double* SAM_Pvwattsv8_Outputs_dc_aget(SAM_table ptr, int* length, SAM_error *err);

diff --git a/api/include/SAM_Singleowner.h b/api/include/SAM_Singleowner.h
@@ -2464,6 +2464,27 @@ extern "C"
 	SAM_EXPORT void SAM_Singleowner_ChargesByMonth_nm_dollars_applied_ym_mset(SAM_table ptr, double* mat, int nrows, int ncols, 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_Singleowner_HybridFin_cf_hybrid_om_sum_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
+
+	/**
+	 * Set is_hybrid: hybrid configuration [0/1]
+	 * options: 0=singletech,1=hybrid
+	 * constraints: None
+	 * required if: ?=0
+	 */
+	SAM_EXPORT void SAM_Singleowner_HybridFin_is_hybrid_nset(SAM_table ptr, double number, SAM_error *err);
+
+
 	/**
 	 * Revenue Getters
 	 */
@@ -3137,6 +3158,15 @@ extern "C"
 	SAM_EXPORT double* SAM_Singleowner_ChargesByMonth_nm_dollars_applied_ym_mget(SAM_table ptr, int* nrows, int* ncols, SAM_error *err);
 
 
+	/**
+	 * HybridFin Getters
+	 */
+
+	SAM_EXPORT double* SAM_Singleowner_HybridFin_cf_hybrid_om_sum_aget(SAM_table ptr, int* length, SAM_error *err);
+
+	SAM_EXPORT double SAM_Singleowner_HybridFin_is_hybrid_nget(SAM_table ptr, SAM_error *err);
+
+
 	/**
 	 * Outputs Getters
 	 */

diff --git a/api/include/SAM_Windpower.h b/api/include/SAM_Windpower.h
@@ -607,6 +607,18 @@ extern "C"
 
 	SAM_EXPORT double SAM_Windpower_Outputs_capacity_factor_nget(SAM_table ptr, SAM_error *err);
 
+	SAM_EXPORT double* SAM_Windpower_Outputs_cf_battery_replacement_cost_schedule_aget(SAM_table ptr, int* length, SAM_error *err);
+
+	SAM_EXPORT double* SAM_Windpower_Outputs_cf_energy_net_aget(SAM_table ptr, int* length, SAM_error *err);
+
+	SAM_EXPORT double* SAM_Windpower_Outputs_cf_om_capacity_aget(SAM_table ptr, int* length, SAM_error *err);
+
+	SAM_EXPORT double* SAM_Windpower_Outputs_cf_om_fixed_aget(SAM_table ptr, int* length, SAM_error *err);
+
+	SAM_EXPORT double* SAM_Windpower_Outputs_cf_om_land_lease_aget(SAM_table ptr, int* length, SAM_error *err);
+
+	SAM_EXPORT double* SAM_Windpower_Outputs_cf_om_production_aget(SAM_table ptr, int* length, SAM_error *err);
+
 	SAM_EXPORT double SAM_Windpower_Outputs_cutoff_losses_nget(SAM_table ptr, SAM_error *err);
 
 	SAM_EXPORT double SAM_Windpower_Outputs_elec_losses_nget(SAM_table ptr, SAM_error *err);