2024.12.12.ssc.297 release candidate - no expiration

NREL · Dec 10, 2024 · 5a29814 · 5a29814
1 parent 45b5ebb
commit 5a29814
Show file tree

Hide file tree

Showing 27 changed files with 396 additions and 408 deletions.
diff --git a/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHCommercial.json b/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHCommercial.json
@@ -28,10 +28,14 @@
 			"V_hdr_min": 2,
 			"V_wind_des": 4,
 			"eta_pump": 0.85,
+			"f_htfmax": 1.2,
+			"f_htfmin": 0.25,
 			"field_fl_props": [
 				[1.000000, 7.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
 			],
 			"land_mult": 1.6,
+			"m_dot_htfmax": 14.4763,
+			"m_dot_htfmin": 3.01589,
 			"mc_bal_cold": 0.2,
 			"mc_bal_hot": 0.2,
 			"mc_bal_sca": 4.5,
@@ -42,16 +46,10 @@
 			"rec_su_delay": 0.2,
 			"theta_dep": 10,
 			"theta_stow": 170,
+			"use_abs_or_rel_mdot_limit": 0,
 			"washes_per_year": 120,
 			"water_per_wash": 0.02
 		},
-		"SolarField": {
-			"f_htfmax": 1.2,
-			"f_htfmin": 0.25,
-			"m_dot_htfmax": 14.4763,
-			"m_dot_htfmin": 3.01589,
-			"use_abs_or_rel_mdot_limit": 0
-		},
 		"ColRec": {
 			"A_aperture": 940.6,
 			"AbsorberMaterial": [1.000000, 1.000000, 1.000000, 1.000000],
@@ -311,7 +309,7 @@
 			"ur_en_ts_buy_rate": 0,
 			"ur_en_ts_sell_rate": 0,
 			"ur_enable_billing_demand": 0,
-			"ur_metering_option": 0,
+			"ur_metering_option": 4,
 			"ur_monthly_fixed_charge": 0,
 			"ur_monthly_min_charge": 0,
 			"ur_nb_apply_credit_current_month": 0,

diff --git a/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHLCOHCalculator.json b/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHLCOHCalculator.json
@@ -28,10 +28,14 @@
 			"V_hdr_min": 2,
 			"V_wind_des": 4,
 			"eta_pump": 0.85,
+			"f_htfmax": 1.2,
+			"f_htfmin": 0.25,
 			"field_fl_props": [
 				[1.000000, 7.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
 			],
 			"land_mult": 1.6,
+			"m_dot_htfmax": 14.4763,
+			"m_dot_htfmin": 3.01589,
 			"mc_bal_cold": 0.2,
 			"mc_bal_hot": 0.2,
 			"mc_bal_sca": 4.5,
@@ -42,16 +46,10 @@
 			"rec_su_delay": 0.2,
 			"theta_dep": 10,
 			"theta_stow": 170,
+			"use_abs_or_rel_mdot_limit": 0,
 			"washes_per_year": 120,
 			"water_per_wash": 0.02
 		},
-		"SolarField": {
-			"f_htfmax": 1.2,
-			"f_htfmin": 0.25,
-			"m_dot_htfmax": 14.4763,
-			"m_dot_htfmin": 3.01589,
-			"use_abs_or_rel_mdot_limit": 0
-		},
 		"ColRec": {
 			"A_aperture": 940.6,
 			"AbsorberMaterial": [1.000000, 1.000000, 1.000000, 1.000000],

diff --git a/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHNone.json b/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHNone.json
@@ -28,10 +28,14 @@
 			"V_hdr_min": 2,
 			"V_wind_des": 4,
 			"eta_pump": 0.85,
+			"f_htfmax": 1.2,
+			"f_htfmin": 0.25,
 			"field_fl_props": [
 				[1.000000, 7.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
 			],
 			"land_mult": 1.6,
+			"m_dot_htfmax": 14.4763,
+			"m_dot_htfmin": 3.01589,
 			"mc_bal_cold": 0.2,
 			"mc_bal_hot": 0.2,
 			"mc_bal_sca": 4.5,
@@ -42,16 +46,10 @@
 			"rec_su_delay": 0.2,
 			"theta_dep": 10,
 			"theta_stow": 170,
+			"use_abs_or_rel_mdot_limit": 0,
 			"washes_per_year": 120,
 			"water_per_wash": 0.02
 		},
-		"SolarField": {
-			"f_htfmax": 1.2,
-			"f_htfmin": 0.25,
-			"m_dot_htfmax": 14.4763,
-			"m_dot_htfmin": 3.01589,
-			"use_abs_or_rel_mdot_limit": 0
-		},
 		"ColRec": {
 			"A_aperture": 940.6,
 			"AbsorberMaterial": [1.000000, 1.000000, 1.000000, 1.000000],

diff --git a/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHSingleOwner.json b/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHSingleOwner.json
@@ -28,10 +28,14 @@
 			"V_hdr_min": 2,
 			"V_wind_des": 4,
 			"eta_pump": 0.85,
+			"f_htfmax": 1.2,
+			"f_htfmin": 0.25,
 			"field_fl_props": [
 				[1.000000, 7.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
 			],
 			"land_mult": 1.6,
+			"m_dot_htfmax": 14.4763,
+			"m_dot_htfmin": 3.01589,
 			"mc_bal_cold": 0.2,
 			"mc_bal_hot": 0.2,
 			"mc_bal_sca": 4.5,
@@ -42,16 +46,10 @@
 			"rec_su_delay": 0.2,
 			"theta_dep": 10,
 			"theta_stow": 170,
+			"use_abs_or_rel_mdot_limit": 0,
 			"washes_per_year": 120,
 			"water_per_wash": 0.02
 		},
-		"SolarField": {
-			"f_htfmax": 1.2,
-			"f_htfmin": 0.25,
-			"m_dot_htfmax": 14.4763,
-			"m_dot_htfmin": 3.01589,
-			"use_abs_or_rel_mdot_limit": 0
-		},
 		"ColRec": {
 			"A_aperture": 940.6,
 			"AbsorberMaterial": [1.000000, 1.000000, 1.000000, 1.000000],
@@ -355,7 +353,7 @@
 			"ur_en_ts_buy_rate": 0,
 			"ur_en_ts_sell_rate": 0,
 			"ur_enable_billing_demand": 0,
-			"ur_metering_option": 0,
+			"ur_metering_option": 4,
 			"ur_monthly_fixed_charge": 0,
 			"ur_monthly_min_charge": 0,
 			"ur_nb_apply_credit_current_month": 0,

diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFAllEquityPartnershipFlip.json
@@ -30,10 +30,14 @@
 			"V_hdr_min": 2,
 			"V_wind_des": 4,
 			"eta_pump": 0.85,
+			"f_htfmax": 1.2,
+			"f_htfmin": 0.25,
 			"field_fl_props": [
 				[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
 			],
 			"land_mult": 1.6,
+			"m_dot_htfmax": 14.4763,
+			"m_dot_htfmin": 3.01589,
 			"mc_bal_cold": 0.2,
 			"mc_bal_hot": 0.2,
 			"mc_bal_sca": 4.5,
@@ -42,16 +46,10 @@
 			"rec_htf_vol": 1,
 			"theta_dep": 10,
 			"theta_stow": 170,
+			"use_abs_or_rel_mdot_limit": 0,
 			"washes_per_year": 120,
 			"water_per_wash": 0.02
 		},
-		"SolarField": {
-			"f_htfmax": 1.2,
-			"f_htfmin": 0.25,
-			"m_dot_htfmax": 14.4763,
-			"m_dot_htfmin": 3.01589,
-			"use_abs_or_rel_mdot_limit": 0
-		},
 		"ColRec": {
 			"A_aperture": 940.6,
 			"AbsorberMaterial": [1.000000, 1.000000, 1.000000, 1.000000],

diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFLeveragedPartnershipFlip.json
@@ -30,10 +30,14 @@
 			"V_hdr_min": 2,
 			"V_wind_des": 4,
 			"eta_pump": 0.85,
+			"f_htfmax": 1.2,
+			"f_htfmin": 0.25,
 			"field_fl_props": [
 				[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
 			],
 			"land_mult": 1.6,
+			"m_dot_htfmax": 14.4763,
+			"m_dot_htfmin": 3.01589,
 			"mc_bal_cold": 0.2,
 			"mc_bal_hot": 0.2,
 			"mc_bal_sca": 4.5,
@@ -42,16 +46,10 @@
 			"rec_htf_vol": 1,
 			"theta_dep": 10,
 			"theta_stow": 170,
+			"use_abs_or_rel_mdot_limit": 0,
 			"washes_per_year": 120,
 			"water_per_wash": 0.02
 		},
-		"SolarField": {
-			"f_htfmax": 1.2,
-			"f_htfmin": 0.25,
-			"m_dot_htfmax": 14.4763,
-			"m_dot_htfmin": 3.01589,
-			"use_abs_or_rel_mdot_limit": 0
-		},
 		"ColRec": {
 			"A_aperture": 940.6,
 			"AbsorberMaterial": [1.000000, 1.000000, 1.000000, 1.000000],

diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFMerchantPlant.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFMerchantPlant.json
@@ -30,10 +30,14 @@
 			"V_hdr_min": 2,
 			"V_wind_des": 4,
 			"eta_pump": 0.85,
+			"f_htfmax": 1.2,
+			"f_htfmin": 0.25,
 			"field_fl_props": [
 				[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
 			],
 			"land_mult": 1.6,
+			"m_dot_htfmax": 14.4763,
+			"m_dot_htfmin": 3.01589,
 			"mc_bal_cold": 0.2,
 			"mc_bal_hot": 0.2,
 			"mc_bal_sca": 4.5,
@@ -42,16 +46,10 @@
 			"rec_htf_vol": 1,
 			"theta_dep": 10,
 			"theta_stow": 170,
+			"use_abs_or_rel_mdot_limit": 0,
 			"washes_per_year": 120,
 			"water_per_wash": 0.02
 		},
-		"SolarField": {
-			"f_htfmax": 1.2,
-			"f_htfmin": 0.25,
-			"m_dot_htfmax": 14.4763,
-			"m_dot_htfmin": 3.01589,
-			"use_abs_or_rel_mdot_limit": 0
-		},
 		"ColRec": {
 			"A_aperture": 940.6,
 			"AbsorberMaterial": [1.000000, 1.000000, 1.000000, 1.000000],

diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFSaleLeaseback.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFSaleLeaseback.json
@@ -30,10 +30,14 @@
 			"V_hdr_min": 2,
 			"V_wind_des": 4,
 			"eta_pump": 0.85,
+			"f_htfmax": 1.2,
+			"f_htfmin": 0.25,
 			"field_fl_props": [
 				[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
 			],
 			"land_mult": 1.6,
+			"m_dot_htfmax": 14.4763,
+			"m_dot_htfmin": 3.01589,
 			"mc_bal_cold": 0.2,
 			"mc_bal_hot": 0.2,
 			"mc_bal_sca": 4.5,
@@ -42,16 +46,10 @@
 			"rec_htf_vol": 1,
 			"theta_dep": 10,
 			"theta_stow": 170,
+			"use_abs_or_rel_mdot_limit": 0,
 			"washes_per_year": 120,
 			"water_per_wash": 0.02
 		},
-		"SolarField": {
-			"f_htfmax": 1.2,
-			"f_htfmin": 0.25,
-			"m_dot_htfmax": 14.4763,
-			"m_dot_htfmin": 3.01589,
-			"use_abs_or_rel_mdot_limit": 0
-		},
 		"ColRec": {
 			"A_aperture": 940.6,
 			"AbsorberMaterial": [1.000000, 1.000000, 1.000000, 1.000000],

diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFSingleOwner.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFSingleOwner.json
@@ -30,10 +30,14 @@
 			"V_hdr_min": 2,
 			"V_wind_des": 4,
 			"eta_pump": 0.85,
+			"f_htfmax": 1.2,
+			"f_htfmin": 0.25,
 			"field_fl_props": [
 				[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
 			],
 			"land_mult": 1.6,
+			"m_dot_htfmax": 14.4763,
+			"m_dot_htfmin": 3.01589,
 			"mc_bal_cold": 0.2,
 			"mc_bal_hot": 0.2,
 			"mc_bal_sca": 4.5,
@@ -42,16 +46,10 @@
 			"rec_htf_vol": 1,
 			"theta_dep": 10,
 			"theta_stow": 170,
+			"use_abs_or_rel_mdot_limit": 0,
 			"washes_per_year": 120,
 			"water_per_wash": 0.02
 		},
-		"SolarField": {
-			"f_htfmax": 1.2,
-			"f_htfmin": 0.25,
-			"m_dot_htfmax": 14.4763,
-			"m_dot_htfmin": 3.01589,
-			"use_abs_or_rel_mdot_limit": 0
-		},
 		"ColRec": {
 			"A_aperture": 940.6,
 			"AbsorberMaterial": [1.000000, 1.000000, 1.000000, 1.000000],

diff --git a/api/api_autogen/library/defaults/SingleownerHeat_MSLFIPHSingleOwner.json b/api/api_autogen/library/defaults/SingleownerHeat_MSLFIPHSingleOwner.json
@@ -311,7 +311,7 @@
 			"ur_en_ts_buy_rate": 0,
 			"ur_en_ts_sell_rate": 0,
 			"ur_enable_billing_demand": 0,
-			"ur_metering_option": 0,
+			"ur_metering_option": 4,
 			"ur_monthly_fixed_charge": 0,
 			"ur_monthly_min_charge": 0,
 			"ur_nb_apply_credit_current_month": 0,

diff --git a/api/api_autogen/library/defaults/SingleownerHeat_PhysicalTroughIPHSingleOwner.json b/api/api_autogen/library/defaults/SingleownerHeat_PhysicalTroughIPHSingleOwner.json
@@ -311,7 +311,7 @@
 			"ur_en_ts_buy_rate": 0,
 			"ur_en_ts_sell_rate": 0,
 			"ur_enable_billing_demand": 0,
-			"ur_metering_option": 0,
+			"ur_metering_option": 4,
 			"ur_monthly_fixed_charge": 0,
 			"ur_monthly_min_charge": 0,
 			"ur_nb_apply_credit_current_month": 0,

diff --git a/api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHSingleOwner.json b/api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHSingleOwner.json
@@ -586,7 +586,7 @@
 			"ur_en_ts_buy_rate": 0,
 			"ur_en_ts_sell_rate": 0,
 			"ur_enable_billing_demand": 0,
-			"ur_metering_option": 0,
+			"ur_metering_option": 4,
 			"ur_monthly_fixed_charge": 0,
 			"ur_monthly_min_charge": 0,
 			"ur_nb_apply_credit_current_month": 0,

diff --git a/api/api_autogen/library/defaults/Utilityrate5_MSLFIPHCommercial.json b/api/api_autogen/library/defaults/Utilityrate5_MSLFIPHCommercial.json
@@ -102,7 +102,7 @@
 			"ur_en_ts_buy_rate": 0,
 			"ur_en_ts_sell_rate": 0,
 			"ur_enable_billing_demand": 0,
-			"ur_metering_option": 0,
+			"ur_metering_option": 4,
 			"ur_monthly_fixed_charge": 0,
 			"ur_monthly_min_charge": 0,
 			"ur_nb_apply_credit_current_month": 0,

diff --git a/api/api_autogen/library/defaults/Utilityrate5_MSLFIPHSingleOwner.json b/api/api_autogen/library/defaults/Utilityrate5_MSLFIPHSingleOwner.json
@@ -97,7 +97,7 @@
 			"ur_en_ts_buy_rate": 0,
 			"ur_en_ts_sell_rate": 0,
 			"ur_enable_billing_demand": 0,
-			"ur_metering_option": 0,
+			"ur_metering_option": 4,
 			"ur_monthly_fixed_charge": 0,
 			"ur_monthly_min_charge": 0,
 			"ur_nb_apply_credit_current_month": 0,