Merge branch 'develop' into noct-taualpha

NREL · Oct 31, 2024 · 6138312 · 6138312
2 parents 620774d + 96e85c3
commit 6138312
Show file tree

Hide file tree

Showing 391 changed files with 2,273,655 additions and 9,839 deletions.
diff --git a/api/api_autogen/builder_PySAM.cpp b/api/api_autogen/builder_PySAM.cpp
@@ -53,11 +53,11 @@ std::string module_doc(const std::string& tech_symbol){
             {"Biomass", "Biomass combustion for electricity generation"},
             {"CashloanModel", "Financial model for residential and commercial behind-the-meter projects"},
             {"Communitysolar", "Community solar owner financial model"},
+            {"CustomGenerationProfile", "Basic power system model using either capacity, capacity factor, and heat rate, or an hourly power generation profile as input (formerly known as Generic System)"},
             {"Equpartflip", "PPA all equity partnership flip (no debt) financial model"},
             {"EtesElectricResistance", "Electric thermal energy storage"},
             {"EtesPtes", "Pumped thermal energy storage"},
             {"Fuelcell", "Fuel cell model"},
-            {"GenericSystem", "Basic power system model using either capacity, capacity factor, and heat rate, or an hourly power generation profile as input"},
             {"Geothermal", "Geothermal power model for hydrothermal and EGS systems with flash or binary conversion"},
             {"Grid", "Electric grid model"},
             {"Hcpv", "Concentrating photovoltaic system with a high concentration photovoltaic module model and separate inverter model"},

diff --git a/api/api_autogen/data_structures.h b/api/api_autogen/data_structures.h
@@ -176,6 +176,9 @@ static std::unordered_map<std::string, std::string> config_to_cmod_name = {
         {"Commercial", "Commercial"},
         {"CommunitySolar", "Communitysolar"},
         {"CspSubcomponent", "CspSubcomponent"},
+        {"CustomGenerationProfile", "CustomGenerationProfile"},
+        {"CustomGenerationBattery", "CustomGenerationBattery"},
+        {"CustomGenerationPVWattsWindFuelCellBatteryHybrid", "CustomGenerationProfile,Pvwattsv8,Windpower,Fuelcell,Battery"},
         {"DishStirling", "Tcsdish"},
         {"DSGLIPH", "LinearFresnelDsgIph"},
         {"DSLF", "TcslinearFresnel"},
@@ -184,9 +187,6 @@ static std::unordered_map<std::string, std::string> config_to_cmod_name = {
         {"FlatPlatePV", "Pvsamv1"},
         {"FuelCell", "Fuelcell"},
         {"GenericCSPSystem", "TcsgenericSolar"},
-        {"GenericSystem", "GenericSystem"},
-        {"GenericBattery", "GenericBattery"},
-        {"GenericPVWattsWindFuelCellBatteryHybrid", "GenericSystem,Pvwattsv8,Windpower,Fuelcell,Battery"},
         {"GeothermalPower", "Geothermal"},
         {"HighXConcentratingPV", "Hcpv"},
         {"HostDeveloper", "HostDeveloper"},

diff --git a/...nericBatteryAllEquityPartnershipFlip.json → ...ationBatteryAllEquityPartnershipFlip.json b/...nericBatteryAllEquityPartnershipFlip.json → ...ationBatteryAllEquityPartnershipFlip.json
diff --git a/...lts/Battery_GenericBatteryCommercial.json → ...ry_CustomGenerationBatteryCommercial.json b/...lts/Battery_GenericBatteryCommercial.json → ...ry_CustomGenerationBatteryCommercial.json
diff --git a/.../Battery_GenericBatteryHostDeveloper.json → ...CustomGenerationBatteryHostDeveloper.json b/.../Battery_GenericBatteryHostDeveloper.json → ...CustomGenerationBatteryHostDeveloper.json
diff --git a/...nericBatteryLeveragedPartnershipFlip.json → ...ationBatteryLeveragedPartnershipFlip.json b/...nericBatteryLeveragedPartnershipFlip.json → ...ationBatteryLeveragedPartnershipFlip.json
diff --git a/.../Battery_GenericBatteryMerchantPlant.json → ...CustomGenerationBatteryMerchantPlant.json b/.../Battery_GenericBatteryMerchantPlant.json → ...CustomGenerationBatteryMerchantPlant.json
diff --git a/...ts/Battery_GenericBatteryResidential.json → ...y_CustomGenerationBatteryResidential.json b/...ts/Battery_GenericBatteryResidential.json → ...y_CustomGenerationBatteryResidential.json
diff --git a/.../Battery_GenericBatterySaleLeaseback.json → ...CustomGenerationBatterySaleLeaseback.json b/.../Battery_GenericBatterySaleLeaseback.json → ...CustomGenerationBatterySaleLeaseback.json
diff --git a/...ts/Battery_GenericBatterySingleOwner.json → ...y_CustomGenerationBatterySingleOwner.json b/...ts/Battery_GenericBatterySingleOwner.json → ...y_CustomGenerationBatterySingleOwner.json
@@ -335,7 +335,7 @@
 			"dispatch_manual_system_charge_first": 0
 		},
 		"SystemCosts": {
-			"om_batt_replacement_cost": [323.000000],
+			"om_batt_replacement_cost": [0.000000],
 			"om_batt_variable_cost": [0.000000],
 			"om_production_escal": 0,
 			"om_replacement_cost_escal": 0

diff --git a/...lts/Battery_GenericBatteryThirdParty.json → ...ry_CustomGenerationBatteryThirdParty.json b/...lts/Battery_GenericBatteryThirdParty.json → ...ry_CustomGenerationBatteryThirdParty.json
diff --git a/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json b/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json
diff --git a/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json b/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json
diff --git a/...ts/Cashloan_GenericBatteryCommercial.json → ...an_CustomGenerationBatteryCommercial.json b/...ts/Cashloan_GenericBatteryCommercial.json → ...an_CustomGenerationBatteryCommercial.json
diff --git a/...s/Cashloan_GenericBatteryResidential.json → ...n_CustomGenerationBatteryResidential.json b/...s/Cashloan_GenericBatteryResidential.json → ...n_CustomGenerationBatteryResidential.json
diff --git a/...lts/Cashloan_GenericSystemCommercial.json → ...an_CustomGenerationProfileCommercial.json b/...lts/Cashloan_GenericSystemCommercial.json → ...an_CustomGenerationProfileCommercial.json
diff --git a/...ts/Cashloan_GenericSystemResidential.json → ...n_CustomGenerationProfileResidential.json b/...ts/Cashloan_GenericSystemResidential.json → ...n_CustomGenerationProfileResidential.json
diff --git a/...nericBatteryAllEquityPartnershipFlip.json → ...ationBatteryAllEquityPartnershipFlip.json b/...nericBatteryAllEquityPartnershipFlip.json → ...ationBatteryAllEquityPartnershipFlip.json
diff --git a/...nericSystem_GenericBatteryCommercial.json → ...on_CustomGenerationBatteryCommercial.json b/...nericSystem_GenericBatteryCommercial.json → ...on_CustomGenerationBatteryCommercial.json
diff --git a/...icSystem_GenericBatteryHostDeveloper.json → ...CustomGenerationBatteryHostDeveloper.json b/...icSystem_GenericBatteryHostDeveloper.json → ...CustomGenerationBatteryHostDeveloper.json
diff --git a/...nericBatteryLeveragedPartnershipFlip.json → ...ationBatteryLeveragedPartnershipFlip.json b/...nericBatteryLeveragedPartnershipFlip.json → ...ationBatteryLeveragedPartnershipFlip.json
diff --git a/...icSystem_GenericBatteryMerchantPlant.json → ...CustomGenerationBatteryMerchantPlant.json b/...icSystem_GenericBatteryMerchantPlant.json → ...CustomGenerationBatteryMerchantPlant.json
diff --git a/...ericSystem_GenericBatteryResidential.json → ...n_CustomGenerationBatteryResidential.json b/...ericSystem_GenericBatteryResidential.json → ...n_CustomGenerationBatteryResidential.json
diff --git a/...icSystem_GenericBatterySaleLeaseback.json → ...CustomGenerationBatterySaleLeaseback.json b/...icSystem_GenericBatterySaleLeaseback.json → ...CustomGenerationBatterySaleLeaseback.json
diff --git a/...ericSystem_GenericBatterySingleOwner.json → ...n_CustomGenerationBatterySingleOwner.json b/...ericSystem_GenericBatterySingleOwner.json → ...n_CustomGenerationBatterySingleOwner.json
diff --git a/...nericSystem_GenericBatteryThirdParty.json → ...on_CustomGenerationBatteryThirdParty.json b/...nericSystem_GenericBatteryThirdParty.json → ...on_CustomGenerationBatteryThirdParty.json
diff --git a/...aults/CustomGeneration_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json b/...aults/CustomGeneration_CustomGenerationPVWattsWindFuelCellBatteryHybridHostDeveloper.json
@@ -0,0 +1,23 @@
+{
+	"defaults": {
+		"Plant": {
+			"conv_eff": 0,
+			"derate": 0,
+			"heat_rate": 0,
+			"spec_mode": 0,
+			"system_capacity": 969.565,
+			"user_capacity_factor": 0
+		},
+		"Lifetime": {
+			"analysis_period": 25
+		},
+		"AdjustmentFactors": {
+		},
+		"HybridCosts": {
+			"om_capacity": [0],
+			"om_fixed": [0],
+			"om_production": [0],
+			"total_installed_cost": 2.91449e+07
+		}
+	}
+}
diff --git a/...efaults/CustomGeneration_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json b/...efaults/CustomGeneration_CustomGenerationPVWattsWindFuelCellBatteryHybridSingleOwner.json
@@ -0,0 +1,23 @@
+{
+	"defaults": {
+		"Plant": {
+			"conv_eff": 0,
+			"derate": 0,
+			"heat_rate": 0,
+			"spec_mode": 0,
+			"system_capacity": 377123,
+			"user_capacity_factor": 0
+		},
+		"Lifetime": {
+			"analysis_period": 25
+		},
+		"AdjustmentFactors": {
+		},
+		"HybridCosts": {
+			"om_capacity": [0],
+			"om_fixed": [0],
+			"om_production": [0],
+			"total_installed_cost": 1.63843e+09
+		}
+	}
+}
diff --git a/...enericSystemAllEquityPartnershipFlip.json → ...ationProfileAllEquityPartnershipFlip.json b/...enericSystemAllEquityPartnershipFlip.json → ...ationProfileAllEquityPartnershipFlip.json
diff --git a/...enericSystem_GenericSystemCommercial.json → ...on_CustomGenerationProfileCommercial.json b/...enericSystem_GenericSystemCommercial.json → ...on_CustomGenerationProfileCommercial.json
diff --git a/...ricSystem_GenericSystemHostDeveloper.json → ...CustomGenerationProfileHostDeveloper.json b/...ricSystem_GenericSystemHostDeveloper.json → ...CustomGenerationProfileHostDeveloper.json
diff --git a/...icSystem_GenericSystemLCOECalculator.json → ...ustomGenerationProfileLCOECalculator.json b/...icSystem_GenericSystemLCOECalculator.json → ...ustomGenerationProfileLCOECalculator.json
diff --git a/...enericSystemLeveragedPartnershipFlip.json → ...ationProfileLeveragedPartnershipFlip.json b/...enericSystemLeveragedPartnershipFlip.json → ...ationProfileLeveragedPartnershipFlip.json
diff --git a/...ricSystem_GenericSystemMerchantPlant.json → ...CustomGenerationProfileMerchantPlant.json b/...ricSystem_GenericSystemMerchantPlant.json → ...CustomGenerationProfileMerchantPlant.json
diff --git a/...ults/GenericSystem_GenericSystemNone.json → ...neration_CustomGenerationProfileNone.json b/...ults/GenericSystem_GenericSystemNone.json → ...neration_CustomGenerationProfileNone.json
diff --git a/...nericSystem_GenericSystemResidential.json → ...n_CustomGenerationProfileResidential.json b/...nericSystem_GenericSystemResidential.json → ...n_CustomGenerationProfileResidential.json
diff --git a/...ricSystem_GenericSystemSaleLeaseback.json → ...CustomGenerationProfileSaleLeaseback.json b/...ricSystem_GenericSystemSaleLeaseback.json → ...CustomGenerationProfileSaleLeaseback.json
diff --git a/...nericSystem_GenericSystemSingleOwner.json → ...n_CustomGenerationProfileSingleOwner.json b/...nericSystem_GenericSystemSingleOwner.json → ...n_CustomGenerationProfileSingleOwner.json
diff --git a/...enericSystem_GenericSystemThirdParty.json → ...on_CustomGenerationProfileThirdParty.json b/...enericSystem_GenericSystemThirdParty.json → ...on_CustomGenerationProfileThirdParty.json
diff --git a/...nericBatteryAllEquityPartnershipFlip.json → ...ationBatteryAllEquityPartnershipFlip.json b/...nericBatteryAllEquityPartnershipFlip.json → ...ationBatteryAllEquityPartnershipFlip.json
diff --git a/...enericSystemAllEquityPartnershipFlip.json → ...ationProfileAllEquityPartnershipFlip.json b/...enericSystemAllEquityPartnershipFlip.json → ...ationProfileAllEquityPartnershipFlip.json
diff --git a/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json b/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json
diff --git a/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json b/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json
diff --git a/.../library/defaults/GenericSystem_GenericPVWattsWindFuelCellBatteryHybridHostDeveloper.json b/.../library/defaults/GenericSystem_GenericPVWattsWindFuelCellBatteryHybridHostDeveloper.json
diff --git a/...en/library/defaults/GenericSystem_GenericPVWattsWindFuelCellBatteryHybridSingleOwner.json b/...en/library/defaults/GenericSystem_GenericPVWattsWindFuelCellBatteryHybridSingleOwner.json
diff --git a/api/api_autogen/library/defaults/Geothermal_GeothermalPowerAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/Geothermal_GeothermalPowerAllEquityPartnershipFlip.json
@@ -11,6 +11,7 @@
 			"T_approach": 5,
 			"T_htf_cold_ref": 90,
 			"T_htf_hot_ref": 200,
+			"allow_reservoir_replacements": 0,
 			"ambient_pressure": 14.7,
 			"analysis_type": 0,
 			"conversion_subtype": 0,

diff --git a/api/api_autogen/library/defaults/Geothermal_GeothermalPowerLCOECalculator.json b/api/api_autogen/library/defaults/Geothermal_GeothermalPowerLCOECalculator.json
@@ -11,6 +11,7 @@
 			"T_approach": 5,
 			"T_htf_cold_ref": 90,
 			"T_htf_hot_ref": 200,
+			"allow_reservoir_replacements": 0,
 			"ambient_pressure": 14.7,
 			"analysis_type": 0,
 			"conversion_subtype": 0,

diff --git a/api/api_autogen/library/defaults/Geothermal_GeothermalPowerLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/Geothermal_GeothermalPowerLeveragedPartnershipFlip.json
@@ -11,6 +11,7 @@
 			"T_approach": 5,
 			"T_htf_cold_ref": 90,
 			"T_htf_hot_ref": 200,
+			"allow_reservoir_replacements": 0,
 			"ambient_pressure": 14.7,
 			"analysis_type": 0,
 			"conversion_subtype": 0,

diff --git a/api/api_autogen/library/defaults/Geothermal_GeothermalPowerMerchantPlant.json b/api/api_autogen/library/defaults/Geothermal_GeothermalPowerMerchantPlant.json
@@ -11,6 +11,7 @@
 			"T_approach": 5,
 			"T_htf_cold_ref": 90,
 			"T_htf_hot_ref": 200,
+			"allow_reservoir_replacements": 0,
 			"ambient_pressure": 14.7,
 			"analysis_type": 0,
 			"conversion_subtype": 0,

diff --git a/api/api_autogen/library/defaults/Geothermal_GeothermalPowerNone.json b/api/api_autogen/library/defaults/Geothermal_GeothermalPowerNone.json
@@ -11,6 +11,7 @@
 			"T_approach": 5,
 			"T_htf_cold_ref": 90,
 			"T_htf_hot_ref": 200,
+			"allow_reservoir_replacements": 0,
 			"ambient_pressure": 14.7,
 			"analysis_type": 0,
 			"conversion_subtype": 0,

diff --git a/api/api_autogen/library/defaults/Geothermal_GeothermalPowerSaleLeaseback.json b/api/api_autogen/library/defaults/Geothermal_GeothermalPowerSaleLeaseback.json
@@ -11,6 +11,7 @@
 			"T_approach": 5,
 			"T_htf_cold_ref": 90,
 			"T_htf_hot_ref": 200,
+			"allow_reservoir_replacements": 0,
 			"ambient_pressure": 14.7,
 			"analysis_type": 0,
 			"conversion_subtype": 0,

diff --git a/api/api_autogen/library/defaults/Geothermal_GeothermalPowerSingleOwner.json b/api/api_autogen/library/defaults/Geothermal_GeothermalPowerSingleOwner.json
@@ -11,6 +11,7 @@
 			"T_approach": 5,
 			"T_htf_cold_ref": 90,
 			"T_htf_hot_ref": 200,
+			"allow_reservoir_replacements": 0,
 			"ambient_pressure": 14.7,
 			"analysis_type": 0,
 			"conversion_subtype": 0,

diff --git a/...nericBatteryAllEquityPartnershipFlip.json → ...ationBatteryAllEquityPartnershipFlip.json b/...nericBatteryAllEquityPartnershipFlip.json → ...ationBatteryAllEquityPartnershipFlip.json
diff --git a/...faults/Grid_GenericBatteryCommercial.json → ...id_CustomGenerationBatteryCommercial.json b/...faults/Grid_GenericBatteryCommercial.json → ...id_CustomGenerationBatteryCommercial.json
diff --git a/...lts/Grid_GenericBatteryHostDeveloper.json → ...CustomGenerationBatteryHostDeveloper.json b/...lts/Grid_GenericBatteryHostDeveloper.json → ...CustomGenerationBatteryHostDeveloper.json
diff --git a/...nericBatteryLeveragedPartnershipFlip.json → ...ationBatteryLeveragedPartnershipFlip.json b/...nericBatteryLeveragedPartnershipFlip.json → ...ationBatteryLeveragedPartnershipFlip.json
diff --git a/...lts/Grid_GenericBatteryMerchantPlant.json → ...CustomGenerationBatteryMerchantPlant.json b/...lts/Grid_GenericBatteryMerchantPlant.json → ...CustomGenerationBatteryMerchantPlant.json
diff --git a/...aults/Grid_GenericBatteryResidential.json → ...d_CustomGenerationBatteryResidential.json b/...aults/Grid_GenericBatteryResidential.json → ...d_CustomGenerationBatteryResidential.json
diff --git a/...lts/Grid_GenericBatterySaleLeaseback.json → ...CustomGenerationBatterySaleLeaseback.json b/...lts/Grid_GenericBatterySaleLeaseback.json → ...CustomGenerationBatterySaleLeaseback.json
diff --git a/...aults/Grid_GenericBatterySingleOwner.json → ...d_CustomGenerationBatterySingleOwner.json b/...aults/Grid_GenericBatterySingleOwner.json → ...d_CustomGenerationBatterySingleOwner.json
diff --git a/...faults/Grid_GenericBatteryThirdParty.json → ...id_CustomGenerationBatteryThirdParty.json b/...faults/Grid_GenericBatteryThirdParty.json → ...id_CustomGenerationBatteryThirdParty.json
diff --git a/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json b/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json
diff --git a/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json b/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json
diff --git a/...enericSystemAllEquityPartnershipFlip.json → ...ationProfileAllEquityPartnershipFlip.json b/...enericSystemAllEquityPartnershipFlip.json → ...ationProfileAllEquityPartnershipFlip.json
diff --git a/...efaults/Grid_GenericSystemCommercial.json → ...id_CustomGenerationProfileCommercial.json b/...efaults/Grid_GenericSystemCommercial.json → ...id_CustomGenerationProfileCommercial.json
diff --git a/...ults/Grid_GenericSystemHostDeveloper.json → ...CustomGenerationProfileHostDeveloper.json b/...ults/Grid_GenericSystemHostDeveloper.json → ...CustomGenerationProfileHostDeveloper.json
diff --git a/...lts/Grid_GenericSystemLCOECalculator.json → ...ustomGenerationProfileLCOECalculator.json b/...lts/Grid_GenericSystemLCOECalculator.json → ...ustomGenerationProfileLCOECalculator.json
diff --git a/...enericSystemLeveragedPartnershipFlip.json → ...ationProfileLeveragedPartnershipFlip.json b/...enericSystemLeveragedPartnershipFlip.json → ...ationProfileLeveragedPartnershipFlip.json
diff --git a/...ults/Grid_GenericSystemMerchantPlant.json → ...CustomGenerationProfileMerchantPlant.json b/...ults/Grid_GenericSystemMerchantPlant.json → ...CustomGenerationProfileMerchantPlant.json
diff --git a/...rary/defaults/Grid_GenericSystemNone.json → ...lts/Grid_CustomGenerationProfileNone.json b/...rary/defaults/Grid_GenericSystemNone.json → ...lts/Grid_CustomGenerationProfileNone.json
diff --git a/...faults/Grid_GenericSystemResidential.json → ...d_CustomGenerationProfileResidential.json b/...faults/Grid_GenericSystemResidential.json → ...d_CustomGenerationProfileResidential.json
diff --git a/...ults/Grid_GenericSystemSaleLeaseback.json → ...CustomGenerationProfileSaleLeaseback.json b/...ults/Grid_GenericSystemSaleLeaseback.json → ...CustomGenerationProfileSaleLeaseback.json
diff --git a/...faults/Grid_GenericSystemSingleOwner.json → ...d_CustomGenerationProfileSingleOwner.json b/...faults/Grid_GenericSystemSingleOwner.json → ...d_CustomGenerationProfileSingleOwner.json
diff --git a/...efaults/Grid_GenericSystemThirdParty.json → ...id_CustomGenerationProfileThirdParty.json b/...efaults/Grid_GenericSystemThirdParty.json → ...id_CustomGenerationProfileThirdParty.json
diff --git a/...eveloper_GenericBatteryHostDeveloper.json → ...CustomGenerationBatteryHostDeveloper.json b/...eveloper_GenericBatteryHostDeveloper.json → ...CustomGenerationBatteryHostDeveloper.json
diff --git a/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json b/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json
diff --git a/...Developer_GenericSystemHostDeveloper.json → ...CustomGenerationProfileHostDeveloper.json b/...Developer_GenericSystemHostDeveloper.json → ...CustomGenerationProfileHostDeveloper.json
diff --git a/.../Lcoefcr_GenericSystemLCOECalculator.json → ...ustomGenerationProfileLCOECalculator.json b/.../Lcoefcr_GenericSystemLCOECalculator.json → ...ustomGenerationProfileLCOECalculator.json
diff --git a/...nericBatteryLeveragedPartnershipFlip.json → ...ationBatteryLeveragedPartnershipFlip.json b/...nericBatteryLeveragedPartnershipFlip.json → ...ationBatteryLeveragedPartnershipFlip.json
diff --git a/...enericSystemLeveragedPartnershipFlip.json → ...ationProfileLeveragedPartnershipFlip.json b/...enericSystemLeveragedPartnershipFlip.json → ...ationProfileLeveragedPartnershipFlip.json
diff --git a/...antplant_GenericBatteryMerchantPlant.json → ...CustomGenerationBatteryMerchantPlant.json b/...antplant_GenericBatteryMerchantPlant.json → ...CustomGenerationBatteryMerchantPlant.json
diff --git a/...hantplant_GenericSystemMerchantPlant.json → ...CustomGenerationProfileMerchantPlant.json b/...hantplant_GenericSystemMerchantPlant.json → ...CustomGenerationProfileMerchantPlant.json
diff --git a/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json b/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json
diff --git a/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json b/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json
diff --git a/...easeback_GenericBatterySaleLeaseback.json → ...CustomGenerationBatterySaleLeaseback.json b/...easeback_GenericBatterySaleLeaseback.json → ...CustomGenerationBatterySaleLeaseback.json
diff --git a/...leaseback_GenericSystemSaleLeaseback.json → ...CustomGenerationProfileSaleLeaseback.json b/...leaseback_GenericSystemSaleLeaseback.json → ...CustomGenerationProfileSaleLeaseback.json
diff --git a/...ingleowner_GenericBatterySingleOwner.json → ...r_CustomGenerationBatterySingleOwner.json b/...ingleowner_GenericBatterySingleOwner.json → ...r_CustomGenerationBatterySingleOwner.json
@@ -77,13 +77,13 @@
 			"term_tenor": 18
 		},
 		"SystemCosts": {
-			"add_om_num_types": 1,
-			"om_batt_capacity_cost": [5.300000],
+			"add_om_num_types": 0,
+			"om_batt_capacity_cost": [0.000000],
 			"om_batt_fixed_cost": [0.000000],
-			"om_batt_nameplate": 240000,
-			"om_batt_replacement_cost": [323.000000],
+			"om_batt_nameplate": 0,
+			"om_batt_replacement_cost": [0.000000],
 			"om_batt_variable_cost": [0.000000],
-			"om_capacity": [25.000000],
+			"om_capacity": [0.000000],
 			"om_capacity_escal": 0,
 			"om_fixed": [0.000000],
 			"om_fixed_escal": 0,

diff --git a/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json b/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json
diff --git a/...Singleowner_GenericSystemSingleOwner.json → ...r_CustomGenerationProfileSingleOwner.json b/...Singleowner_GenericSystemSingleOwner.json → ...r_CustomGenerationProfileSingleOwner.json
diff --git a/...tyownership_GenericBatteryThirdParty.json → ...ip_CustomGenerationBatteryThirdParty.json b/...tyownership_GenericBatteryThirdParty.json → ...ip_CustomGenerationBatteryThirdParty.json
diff --git a/...rtyownership_GenericSystemThirdParty.json → ...ip_CustomGenerationProfileThirdParty.json b/...rtyownership_GenericSystemThirdParty.json → ...ip_CustomGenerationProfileThirdParty.json
diff --git a/...nericBatteryAllEquityPartnershipFlip.json → ...ationBatteryAllEquityPartnershipFlip.json b/...nericBatteryAllEquityPartnershipFlip.json → ...ationBatteryAllEquityPartnershipFlip.json
diff --git a/...tilityrate5_GenericBatteryCommercial.json → ...e5_CustomGenerationBatteryCommercial.json b/...tilityrate5_GenericBatteryCommercial.json → ...e5_CustomGenerationBatteryCommercial.json
diff --git a/...ityrate5_GenericBatteryHostDeveloper.json → ...CustomGenerationBatteryHostDeveloper.json b/...ityrate5_GenericBatteryHostDeveloper.json → ...CustomGenerationBatteryHostDeveloper.json
diff --git a/...nericBatteryLeveragedPartnershipFlip.json → ...ationBatteryLeveragedPartnershipFlip.json b/...nericBatteryLeveragedPartnershipFlip.json → ...ationBatteryLeveragedPartnershipFlip.json
diff --git a/...ityrate5_GenericBatteryMerchantPlant.json → ...CustomGenerationBatteryMerchantPlant.json b/...ityrate5_GenericBatteryMerchantPlant.json → ...CustomGenerationBatteryMerchantPlant.json
diff --git a/...ilityrate5_GenericBatteryResidential.json → ...5_CustomGenerationBatteryResidential.json b/...ilityrate5_GenericBatteryResidential.json → ...5_CustomGenerationBatteryResidential.json
diff --git a/...ityrate5_GenericBatterySaleLeaseback.json → ...CustomGenerationBatterySaleLeaseback.json b/...ityrate5_GenericBatterySaleLeaseback.json → ...CustomGenerationBatterySaleLeaseback.json
diff --git a/...ilityrate5_GenericBatterySingleOwner.json → ...5_CustomGenerationBatterySingleOwner.json b/...ilityrate5_GenericBatterySingleOwner.json → ...5_CustomGenerationBatterySingleOwner.json
diff --git a/...tilityrate5_GenericBatteryThirdParty.json → ...e5_CustomGenerationBatteryThirdParty.json b/...tilityrate5_GenericBatteryThirdParty.json → ...e5_CustomGenerationBatteryThirdParty.json
diff --git a/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json b/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json
diff --git a/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json b/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json
diff --git a/...enericSystemAllEquityPartnershipFlip.json → ...ationProfileAllEquityPartnershipFlip.json b/...enericSystemAllEquityPartnershipFlip.json → ...ationProfileAllEquityPartnershipFlip.json
diff --git a/...Utilityrate5_GenericSystemCommercial.json → ...e5_CustomGenerationProfileCommercial.json b/...Utilityrate5_GenericSystemCommercial.json → ...e5_CustomGenerationProfileCommercial.json
diff --git a/...lityrate5_GenericSystemHostDeveloper.json → ...CustomGenerationProfileHostDeveloper.json b/...lityrate5_GenericSystemHostDeveloper.json → ...CustomGenerationProfileHostDeveloper.json
diff --git a/...enericSystemLeveragedPartnershipFlip.json → ...ationProfileLeveragedPartnershipFlip.json b/...enericSystemLeveragedPartnershipFlip.json → ...ationProfileLeveragedPartnershipFlip.json
diff --git a/...lityrate5_GenericSystemMerchantPlant.json → ...CustomGenerationProfileMerchantPlant.json b/...lityrate5_GenericSystemMerchantPlant.json → ...CustomGenerationProfileMerchantPlant.json
diff --git a/...tilityrate5_GenericSystemResidential.json → ...5_CustomGenerationProfileResidential.json b/...tilityrate5_GenericSystemResidential.json → ...5_CustomGenerationProfileResidential.json
diff --git a/...lityrate5_GenericSystemSaleLeaseback.json → ...CustomGenerationProfileSaleLeaseback.json b/...lityrate5_GenericSystemSaleLeaseback.json → ...CustomGenerationProfileSaleLeaseback.json
diff --git a/...tilityrate5_GenericSystemSingleOwner.json → ...5_CustomGenerationProfileSingleOwner.json b/...tilityrate5_GenericSystemSingleOwner.json → ...5_CustomGenerationProfileSingleOwner.json
diff --git a/...Utilityrate5_GenericSystemThirdParty.json → ...e5_CustomGenerationProfileThirdParty.json b/...Utilityrate5_GenericSystemThirdParty.json → ...e5_CustomGenerationProfileThirdParty.json
diff --git a/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json b/...ndFuelCellBatteryHybridHostDeveloper.json → ...ndFuelCellBatteryHybridHostDeveloper.json
diff --git a/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json b/...WindFuelCellBatteryHybridSingleOwner.json → ...WindFuelCellBatteryHybridSingleOwner.json
diff --git a/api/include/SAM_Cashloan.h b/api/include/SAM_Cashloan.h
@@ -182,15 +182,15 @@ extern "C"
 
 	/**
 	 * Set annual_fuel_usage: Fuel usage (yr 1) [kWht]
-	 * options: generic_system,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
+	 * options: custom_generation,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
 	 * constraints: MIN=0
 	 * required if: ?=0
 	 */
 	SAM_EXPORT void SAM_Cashloan_SystemCosts_annual_fuel_usage_nset(SAM_table ptr, double number, SAM_error *err);
 
 	/**
 	 * Set annual_fuel_usage_lifetime: Fuel usage (lifetime) [kWht]
-	 * options: generic_system,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
+	 * options: custom_generation,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
 	 * constraints: None
 	 * required if: None
 	 */
@@ -270,15 +270,15 @@ extern "C"
 
 	/**
 	 * Set om_fuel_cost: Fuel cost [$/MMBtu]
-	 * options: generic_system,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
+	 * options: custom_generation,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
 	 * constraints: None
 	 * required if: ?=0.0
 	 */
 	SAM_EXPORT void SAM_Cashloan_SystemCosts_om_fuel_cost_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
 
 	/**
 	 * Set om_fuel_cost_escal: Fuel cost escalation [%/year]
-	 * options: generic_system,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
+	 * options: custom_generation,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
 	 * constraints: None
 	 * required if: ?=0.0
 	 */

diff --git a/api/include/SAM_Communitysolar.h b/api/include/SAM_Communitysolar.h
@@ -342,15 +342,15 @@ extern "C"
 
 	/**
 	 * Set annual_fuel_usage: Fuel usage (yr 1) [kWht]
-	 * options: generic_system,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
+	 * options: custom_generation,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
 	 * constraints: MIN=0
 	 * required if: ?=0
 	 */
 	SAM_EXPORT void SAM_Communitysolar_SystemCosts_annual_fuel_usage_nset(SAM_table ptr, double number, SAM_error *err);
 
 	/**
 	 * Set annual_fuel_usage_lifetime: Fuel usage (lifetime) [kWht]
-	 * options: generic_system,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
+	 * options: custom_generation,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
 	 * constraints: None
 	 * required if: None
 	 */
@@ -430,15 +430,15 @@ extern "C"
 
 	/**
 	 * Set om_fuel_cost: Fuel cost [$/MMBtu]
-	 * options: generic_system,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
+	 * options: custom_generation,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
 	 * constraints: None
 	 * required if: ?=0.0
 	 */
 	SAM_EXPORT void SAM_Communitysolar_SystemCosts_om_fuel_cost_aset(SAM_table ptr, double* arr, int length, SAM_error *err);
 
 	/**
 	 * Set om_fuel_cost_escal: Fuel cost escalation [%/year]
-	 * options: generic_system,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
+	 * options: custom_generation,fuelcell,tcslinearfresnel,tcstroughempirical,tcsgenericsolar,fresnelphysical
 	 * constraints: None
 	 * required if: ?=0.0
 	 */