Fix failing SAM_api project and update cashflow for hybrid single owner

NREL · Jul 17, 2023 · 69fa40d · 69fa40d
1 parent 25c346e
commit 69fa40d
Show file tree

Hide file tree

Showing 27 changed files with 373 additions and 0 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/Pvwattsv8_FuelCellCommercial.json b/api/api_autogen/library/defaults/Pvwattsv8_FuelCellCommercial.json
@@ -56,6 +56,8 @@
 				[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,6 +56,8 @@
 				[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/Windpower_WindPowerNone.json b/api/api_autogen/library/defaults/Windpower_WindPowerNone.json
@@ -78,6 +78,8 @@
 		},
 		"Uncertainty": {
 			"total_uncert": 12.085
+		},
+		"HybridTech": {
 		}
 	}
 }
diff --git a/api/include/SAM_Battery.h b/api/include/SAM_Battery.h
@@ -1710,6 +1710,19 @@ 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
 	 */
@@ -2187,6 +2200,13 @@ 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
 	 */
@@ -2321,6 +2341,16 @@ 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_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_Pvwattsv8.h b/api/include/SAM_Pvwattsv8.h
@@ -404,6 +404,19 @@ 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
 	 */
@@ -517,6 +530,13 @@ 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
 	 */
@@ -543,6 +563,16 @@ 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_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_Windpower.h b/api/include/SAM_Windpower.h
@@ -457,6 +457,19 @@ extern "C"
 	SAM_EXPORT void SAM_Windpower_Uncertainty_total_uncert_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_Windpower_HybridTech_is_hybrid_nset(SAM_table ptr, double number, SAM_error *err);
+
+
 	/**
 	 * Resource Getters
 	 */
@@ -587,6 +600,13 @@ extern "C"
 	SAM_EXPORT double SAM_Windpower_Uncertainty_total_uncert_nget(SAM_table ptr, SAM_error *err);
 
 
+	/**
+	 * HybridTech Getters
+	 */
+
+	SAM_EXPORT double SAM_Windpower_HybridTech_is_hybrid_nget(SAM_table ptr, SAM_error *err);
+
+
 	/**
 	 * Outputs Getters
 	 */
@@ -607,6 +627,16 @@ extern "C"
 
 	SAM_EXPORT double SAM_Windpower_Outputs_capacity_factor_nget(SAM_table ptr, 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);

diff --git a/api/modules/SAM_Battery.cpp b/api/modules/SAM_Battery.cpp
@@ -1220,6 +1220,12 @@ SAM_EXPORT void SAM_Battery_GridLimits_grid_interconnection_limit_kwac_nset(SAM_
 	});
 }
 
+SAM_EXPORT void SAM_Battery_HybridTech_is_hybrid_nset(SAM_table ptr, double number, SAM_error *err){
+	translateExceptions(err, [&]{
+		ssc_data_set_number(ptr, "is_hybrid", number);
+	});
+}
+
 SAM_EXPORT double SAM_Battery_Simulation_percent_complete_nget(SAM_table ptr, SAM_error *err){
 	double result;
 	translateExceptions(err, [&]{
@@ -3498,6 +3504,17 @@ SAM_EXPORT double SAM_Battery_GridLimits_grid_interconnection_limit_kwac_nget(SA
 
 
 
+SAM_EXPORT double SAM_Battery_HybridTech_is_hybrid_nget(SAM_table ptr, SAM_error *err){
+	double result;
+	translateExceptions(err, [&]{
+	if (!ssc_data_get_number(ptr, "is_hybrid", &result))
+		make_access_error("SAM_Battery", "is_hybrid");
+	});
+	return result;
+}
+
+
+
 SAM_EXPORT double SAM_Battery_Outputs_annual_crit_load_nget(SAM_table ptr, SAM_error *err){
 	double result;
 	translateExceptions(err, [&]{
@@ -4264,6 +4281,66 @@ SAM_EXPORT double* SAM_Battery_Outputs_cdf_of_surviving_aget(SAM_table ptr, int*
 
 
 
+SAM_EXPORT double* SAM_Battery_Outputs_cf_energy_net_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "cf_energy_net", length);
+	if (!result)
+		make_access_error("SAM_Battery", "cf_energy_net");
+	});
+	return result;
+}
+
+
+
+SAM_EXPORT double* SAM_Battery_Outputs_cf_om_capacity_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "cf_om_capacity", length);
+	if (!result)
+		make_access_error("SAM_Battery", "cf_om_capacity");
+	});
+	return result;
+}
+
+
+
+SAM_EXPORT double* SAM_Battery_Outputs_cf_om_fixed_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "cf_om_fixed", length);
+	if (!result)
+		make_access_error("SAM_Battery", "cf_om_fixed");
+	});
+	return result;
+}
+
+
+
+SAM_EXPORT double* SAM_Battery_Outputs_cf_om_land_lease_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "cf_om_land_lease", length);
+	if (!result)
+		make_access_error("SAM_Battery", "cf_om_land_lease");
+	});
+	return result;
+}
+
+
+
+SAM_EXPORT double* SAM_Battery_Outputs_cf_om_production_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "cf_om_production", length);
+	if (!result)
+		make_access_error("SAM_Battery", "cf_om_production");
+	});
+	return result;
+}
+
+
+
 SAM_EXPORT double* SAM_Battery_Outputs_crit_load_aget(SAM_table ptr, int* length, SAM_error *err){
 	double* result = nullptr;
 	translateExceptions(err, [&]{

diff --git a/api/modules/SAM_Pvwattsv8.cpp b/api/modules/SAM_Pvwattsv8.cpp
@@ -278,6 +278,12 @@ SAM_EXPORT void SAM_Pvwattsv8_AdjustmentFactors_adjust_timeindex_aset(SAM_table
 	});
 }
 
+SAM_EXPORT void SAM_Pvwattsv8_HybridTech_is_hybrid_nset(SAM_table ptr, double number, SAM_error *err){
+	translateExceptions(err, [&]{
+		ssc_data_set_number(ptr, "is_hybrid", number);
+	});
+}
+
 SAM_EXPORT double* SAM_Pvwattsv8_SolarResource_albedo_aget(SAM_table ptr, int* length, SAM_error *err){
 	double* result = nullptr;
 	translateExceptions(err, [&]{
@@ -772,6 +778,17 @@ SAM_EXPORT double* SAM_Pvwattsv8_AdjustmentFactors_adjust_timeindex_aget(SAM_tab
 
 
 
+SAM_EXPORT double SAM_Pvwattsv8_HybridTech_is_hybrid_nget(SAM_table ptr, SAM_error *err){
+	double result;
+	translateExceptions(err, [&]{
+	if (!ssc_data_get_number(ptr, "is_hybrid", &result))
+		make_access_error("SAM_Pvwattsv8", "is_hybrid");
+	});
+	return result;
+}
+
+
+
 SAM_EXPORT double* SAM_Pvwattsv8_Outputs_ac_aget(SAM_table ptr, int* length, SAM_error *err){
 	double* result = nullptr;
 	translateExceptions(err, [&]{
@@ -899,6 +916,66 @@ SAM_EXPORT double SAM_Pvwattsv8_Outputs_capacity_factor_ac_nget(SAM_table ptr, S
 
 
 
+SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_energy_net_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "cf_energy_net", length);
+	if (!result)
+		make_access_error("SAM_Pvwattsv8", "cf_energy_net");
+	});
+	return result;
+}
+
+
+
+SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_om_capacity_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "cf_om_capacity", length);
+	if (!result)
+		make_access_error("SAM_Pvwattsv8", "cf_om_capacity");
+	});
+	return result;
+}
+
+
+
+SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_om_fixed_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "cf_om_fixed", length);
+	if (!result)
+		make_access_error("SAM_Pvwattsv8", "cf_om_fixed");
+	});
+	return result;
+}
+
+
+
+SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_om_land_lease_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "cf_om_land_lease", length);
+	if (!result)
+		make_access_error("SAM_Pvwattsv8", "cf_om_land_lease");
+	});
+	return result;
+}
+
+
+
+SAM_EXPORT double* SAM_Pvwattsv8_Outputs_cf_om_production_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "cf_om_production", length);
+	if (!result)
+		make_access_error("SAM_Pvwattsv8", "cf_om_production");
+	});
+	return result;
+}
+
+
+
 SAM_EXPORT const char* SAM_Pvwattsv8_Outputs_city_sget(SAM_table ptr, SAM_error *err){
 	const char* result = nullptr;
 	translateExceptions(err, [&]{