diff --git a/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHCommercial.json b/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHCommercial.json index e5714b9ed..331baa3e8 100644 --- 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 index a94f62f8b..e50070bb4 100644 --- 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 index 7eaf40a1b..d3c584b58 100644 --- 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 index 50b581499..5ff4ecc54 100644 --- 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 index 4e9895b5a..494e5c1bf 100644 --- 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 index cdd85cb38..9df3fcd7f 100644 --- 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 index 4ee858cb7..ed5587702 100644 --- 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 index c30f5fd6d..4b6542471 100644 --- 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 index 5909060e4..07ec8bd47 100644 --- 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 index f6fa1311a..3f2de315b 100644 --- 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 index 5f6be959e..dd76673bf 100644 --- 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 index 223749ea8..51fb058bd 100644 --- 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 index be0f8d0ab..7cccce866 100644 --- 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 index e11e57fc7..2b0ae0f14 100644 --- 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, diff --git a/api/api_autogen/library/defaults/Utilityrate5_PVWattsWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Utilityrate5_PVWattsWindBatteryHybridHostDeveloper.json index 72f8ec16e..628183b48 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_PVWattsWindBatteryHybridHostDeveloper.json +++ b/api/api_autogen/library/defaults/Utilityrate5_PVWattsWindBatteryHybridHostDeveloper.json @@ -16,7 +16,7 @@ "ur_dc_billing_demand_periods": [ [0.000000] ], - "ur_dc_enable": 0, + "ur_dc_enable": 1, "ur_dc_flat_mat": [ [0.000000, 1.000000, 99999999999999997748809823456034029568.000000, 0.000000], [1.000000, 1.000000, 99999999999999997748809823456034029568.000000, 0.000000], @@ -32,36 +32,38 @@ [11.000000, 1.000000, 99999999999999997748809823456034029568.000000, 0.000000] ], "ur_dc_sched_weekday": [ - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000] + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000] ], "ur_dc_sched_weekend": [ - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000] + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000] ], "ur_dc_tou_mat": [ - [1.000000, 1.000000, 99999999999999997748809823456034029568.000000, 0.000000], - [2.000000, 1.000000, 99999999999999997748809823456034029568.000000, 0.000000] + [1.000000, 1.000000, 100.000000, 20.000000], + [1.000000, 2.000000, 99999999999999997748809823456034029568.000000, 15.000000], + [2.000000, 1.000000, 100.000000, 10.000000], + [2.000000, 2.000000, 99999999999999997748809823456034029568.000000, 5.000000] ], "ur_ec_sched_weekday": [ [4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 3.000000, 3.000000, 3.000000, 3.000000, 3.000000, 4.000000, 4.000000, 4.000000, 4.000000], diff --git a/api/api_autogen/library/defaults/Utilityrate5_PVWattsWindFuelCellBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Utilityrate5_PVWattsWindFuelCellBatteryHybridHostDeveloper.json index 2c2ca6e55..4372fabeb 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_PVWattsWindFuelCellBatteryHybridHostDeveloper.json +++ b/api/api_autogen/library/defaults/Utilityrate5_PVWattsWindFuelCellBatteryHybridHostDeveloper.json @@ -46,18 +46,18 @@ [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000] ], "ur_dc_sched_weekend": [ - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], - [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000] + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000] ], "ur_dc_tou_mat": [ [1.000000, 1.000000, 100.000000, 20.000000], diff --git a/api/api_autogen/library/defaults/Utilityrate5_PhotovoltaicWindBatteryHybridHostDeveloper.json b/api/api_autogen/library/defaults/Utilityrate5_PhotovoltaicWindBatteryHybridHostDeveloper.json index d191bc817..70dc5e427 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_PhotovoltaicWindBatteryHybridHostDeveloper.json +++ b/api/api_autogen/library/defaults/Utilityrate5_PhotovoltaicWindBatteryHybridHostDeveloper.json @@ -16,7 +16,7 @@ "ur_dc_billing_demand_periods": [ [0.000000] ], - "ur_dc_enable": 0, + "ur_dc_enable": 1, "ur_dc_flat_mat": [ [0.000000, 1.000000, 99999999999999997748809823456034029568.000000, 0.000000], [1.000000, 1.000000, 99999999999999997748809823456034029568.000000, 0.000000], @@ -32,36 +32,38 @@ [11.000000, 1.000000, 99999999999999997748809823456034029568.000000, 0.000000] ], "ur_dc_sched_weekday": [ - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000] + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 2.000000, 2.000000, 2.000000, 2.000000] ], "ur_dc_sched_weekend": [ - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000], - [1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000] + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000], + [2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000, 2.000000] ], "ur_dc_tou_mat": [ - [1.000000, 1.000000, 99999999999999997748809823456034029568.000000, 0.000000], - [2.000000, 1.000000, 99999999999999997748809823456034029568.000000, 0.000000] + [1.000000, 1.000000, 100.000000, 20.000000], + [1.000000, 2.000000, 99999999999999997748809823456034029568.000000, 15.000000], + [2.000000, 1.000000, 100.000000, 10.000000], + [2.000000, 2.000000, 99999999999999997748809823456034029568.000000, 5.000000] ], "ur_ec_sched_weekday": [ [4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 4.000000, 3.000000, 3.000000, 3.000000, 3.000000, 3.000000, 4.000000, 4.000000, 4.000000, 4.000000], diff --git a/api/api_autogen/library/defaults/Utilityrate5_PhysicalTroughIPHSingleOwner.json b/api/api_autogen/library/defaults/Utilityrate5_PhysicalTroughIPHSingleOwner.json index e11e57fc7..2b0ae0f14 100644 --- a/api/api_autogen/library/defaults/Utilityrate5_PhysicalTroughIPHSingleOwner.json +++ b/api/api_autogen/library/defaults/Utilityrate5_PhysicalTroughIPHSingleOwner.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, diff --git a/api/include/SAM_FresnelPhysical.h b/api/include/SAM_FresnelPhysical.h index 8db5b012b..138c210bb 100644 --- a/api/include/SAM_FresnelPhysical.h +++ b/api/include/SAM_FresnelPhysical.h @@ -254,6 +254,22 @@ extern "C" */ SAM_EXPORT void SAM_FresnelPhysical_SolarField_eta_pump_nset(SAM_table ptr, double number, SAM_error *err); + /** + * Set f_htfmax: Maximum loop mass flow rate fraction of design + * options: None + * constraints: None + * required if: use_abs_or_rel_mdot_limit=1 + */ + SAM_EXPORT void SAM_FresnelPhysical_SolarField_f_htfmax_nset(SAM_table ptr, double number, SAM_error *err); + + /** + * Set f_htfmin: Minimum loop mass flow rate fraction of design + * options: None + * constraints: None + * required if: use_abs_or_rel_mdot_limit=1 + */ + SAM_EXPORT void SAM_FresnelPhysical_SolarField_f_htfmin_nset(SAM_table ptr, double number, SAM_error *err); + /** * Set field_fl_props: Fluid property data * options: None @@ -270,6 +286,22 @@ extern "C" */ SAM_EXPORT void SAM_FresnelPhysical_SolarField_land_mult_nset(SAM_table ptr, double number, SAM_error *err); + /** + * Set m_dot_htfmax: Maximum loop HTF flow rate [kg/s] + * options: None + * constraints: None + * required if: use_abs_or_rel_mdot_limit=0 + */ + SAM_EXPORT void SAM_FresnelPhysical_SolarField_m_dot_htfmax_nset(SAM_table ptr, double number, SAM_error *err); + + /** + * Set m_dot_htfmin: Minimum loop HTF flow rate [kg/s] + * options: None + * constraints: None + * required if: use_abs_or_rel_mdot_limit=0 + */ + SAM_EXPORT void SAM_FresnelPhysical_SolarField_m_dot_htfmin_nset(SAM_table ptr, double number, SAM_error *err); + /** * Set mc_bal_cold: The heat capacity of the balance of plant on the cold side [kWht/K-MWt] * options: None @@ -335,65 +367,28 @@ extern "C" SAM_EXPORT void SAM_FresnelPhysical_SolarField_theta_stow_nset(SAM_table ptr, double number, SAM_error *err); /** - * Set washes_per_year: Mirror washing frequency [none] + * Set use_abs_or_rel_mdot_limit: Use mass flow abs (0) or relative (1) limits * options: None * constraints: None - * required if: * + * required if: ?=0 */ - SAM_EXPORT void SAM_FresnelPhysical_SolarField_washes_per_year_nset(SAM_table ptr, double number, SAM_error *err); + SAM_EXPORT void SAM_FresnelPhysical_SolarField_use_abs_or_rel_mdot_limit_nset(SAM_table ptr, double number, SAM_error *err); /** - * Set water_per_wash: Water usage per wash [L/m2_aper] + * Set washes_per_year: Mirror washing frequency [none] * options: None * constraints: None * required if: * */ - SAM_EXPORT void SAM_FresnelPhysical_SolarField_water_per_wash_nset(SAM_table ptr, double number, SAM_error *err); - - - // - // SolarField parameters - // - - /** - * Set f_htfmax: Maximum loop mass flow rate fraction of design - * options: None - * constraints: None - * required if: use_abs_or_rel_mdot_limit=1 - */ - SAM_EXPORT void SAM_FresnelPhysical_SolarField_f_htfmax_nset(SAM_table ptr, double number, SAM_error *err); - - /** - * Set f_htfmin: Minimum loop mass flow rate fraction of design - * options: None - * constraints: None - * required if: use_abs_or_rel_mdot_limit=1 - */ - SAM_EXPORT void SAM_FresnelPhysical_SolarField_f_htfmin_nset(SAM_table ptr, double number, SAM_error *err); - - /** - * Set m_dot_htfmax: Maximum loop HTF flow rate [kg/s] - * options: None - * constraints: None - * required if: use_abs_or_rel_mdot_limit=0 - */ - SAM_EXPORT void SAM_FresnelPhysical_SolarField_m_dot_htfmax_nset(SAM_table ptr, double number, SAM_error *err); - - /** - * Set m_dot_htfmin: Minimum loop HTF flow rate [kg/s] - * options: None - * constraints: None - * required if: use_abs_or_rel_mdot_limit=0 - */ - SAM_EXPORT void SAM_FresnelPhysical_SolarField_m_dot_htfmin_nset(SAM_table ptr, double number, SAM_error *err); + SAM_EXPORT void SAM_FresnelPhysical_SolarField_washes_per_year_nset(SAM_table ptr, double number, SAM_error *err); /** - * Set use_abs_or_rel_mdot_limit: Use mass flow abs (0) or relative (1) limits + * Set water_per_wash: Water usage per wash [L/m2_aper] * options: None * constraints: None - * required if: ?=0 + * required if: * */ - SAM_EXPORT void SAM_FresnelPhysical_SolarField_use_abs_or_rel_mdot_limit_nset(SAM_table ptr, double number, SAM_error *err); + SAM_EXPORT void SAM_FresnelPhysical_SolarField_water_per_wash_nset(SAM_table ptr, double number, SAM_error *err); // @@ -1849,10 +1844,18 @@ extern "C" SAM_EXPORT double SAM_FresnelPhysical_SolarField_eta_pump_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double SAM_FresnelPhysical_SolarField_f_htfmax_nget(SAM_table ptr, SAM_error *err); + + SAM_EXPORT double SAM_FresnelPhysical_SolarField_f_htfmin_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double* SAM_FresnelPhysical_SolarField_field_fl_props_mget(SAM_table ptr, int* nrows, int* ncols, SAM_error *err); SAM_EXPORT double SAM_FresnelPhysical_SolarField_land_mult_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double SAM_FresnelPhysical_SolarField_m_dot_htfmax_nget(SAM_table ptr, SAM_error *err); + + SAM_EXPORT double SAM_FresnelPhysical_SolarField_m_dot_htfmin_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double SAM_FresnelPhysical_SolarField_mc_bal_cold_nget(SAM_table ptr, SAM_error *err); SAM_EXPORT double SAM_FresnelPhysical_SolarField_mc_bal_hot_nget(SAM_table ptr, SAM_error *err); @@ -1869,26 +1872,13 @@ extern "C" SAM_EXPORT double SAM_FresnelPhysical_SolarField_theta_stow_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double SAM_FresnelPhysical_SolarField_use_abs_or_rel_mdot_limit_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double SAM_FresnelPhysical_SolarField_washes_per_year_nget(SAM_table ptr, SAM_error *err); SAM_EXPORT double SAM_FresnelPhysical_SolarField_water_per_wash_nget(SAM_table ptr, SAM_error *err); - /** - * SolarField Getters - */ - - SAM_EXPORT double SAM_FresnelPhysical_SolarField_f_htfmax_nget(SAM_table ptr, SAM_error *err); - - SAM_EXPORT double SAM_FresnelPhysical_SolarField_f_htfmin_nget(SAM_table ptr, SAM_error *err); - - SAM_EXPORT double SAM_FresnelPhysical_SolarField_m_dot_htfmax_nget(SAM_table ptr, SAM_error *err); - - SAM_EXPORT double SAM_FresnelPhysical_SolarField_m_dot_htfmin_nget(SAM_table ptr, SAM_error *err); - - SAM_EXPORT double SAM_FresnelPhysical_SolarField_use_abs_or_rel_mdot_limit_nget(SAM_table ptr, SAM_error *err); - - /** * ColRec Getters */ diff --git a/api/include/SAM_FresnelPhysicalIph.h b/api/include/SAM_FresnelPhysicalIph.h index 33010d0d5..79fedca14 100644 --- a/api/include/SAM_FresnelPhysicalIph.h +++ b/api/include/SAM_FresnelPhysicalIph.h @@ -238,6 +238,22 @@ extern "C" */ SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_eta_pump_nset(SAM_table ptr, double number, SAM_error *err); + /** + * Set f_htfmax: Maximum loop mass flow rate fraction of design + * options: None + * constraints: None + * required if: use_abs_or_rel_mdot_limit=1 + */ + SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_f_htfmax_nset(SAM_table ptr, double number, SAM_error *err); + + /** + * Set f_htfmin: Minimum loop mass flow rate fraction of design + * options: None + * constraints: None + * required if: use_abs_or_rel_mdot_limit=1 + */ + SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_f_htfmin_nset(SAM_table ptr, double number, SAM_error *err); + /** * Set field_fl_props: Fluid property data * options: None @@ -254,6 +270,22 @@ extern "C" */ SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_land_mult_nset(SAM_table ptr, double number, SAM_error *err); + /** + * Set m_dot_htfmax: Maximum loop HTF flow rate [kg/s] + * options: None + * constraints: None + * required if: use_abs_or_rel_mdot_limit=0 + */ + SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_m_dot_htfmax_nset(SAM_table ptr, double number, SAM_error *err); + + /** + * Set m_dot_htfmin: Minimum loop HTF flow rate [kg/s] + * options: None + * constraints: None + * required if: use_abs_or_rel_mdot_limit=0 + */ + SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_m_dot_htfmin_nset(SAM_table ptr, double number, SAM_error *err); + /** * Set mc_bal_cold: The heat capacity of the balance of plant on the cold side [kWht/K-MWt] * options: None @@ -335,65 +367,28 @@ extern "C" SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_theta_stow_nset(SAM_table ptr, double number, SAM_error *err); /** - * Set washes_per_year: Mirror washing frequency [none] + * Set use_abs_or_rel_mdot_limit: Use mass flow abs (0) or relative (1) limits * options: None * constraints: None - * required if: * + * required if: ?=0 */ - SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_washes_per_year_nset(SAM_table ptr, double number, SAM_error *err); + SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_use_abs_or_rel_mdot_limit_nset(SAM_table ptr, double number, SAM_error *err); /** - * Set water_per_wash: Water usage per wash [L/m2_aper] + * Set washes_per_year: Mirror washing frequency [none] * options: None * constraints: None * required if: * */ - SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_water_per_wash_nset(SAM_table ptr, double number, SAM_error *err); - - - // - // SolarField parameters - // - - /** - * Set f_htfmax: Maximum loop mass flow rate fraction of design - * options: None - * constraints: None - * required if: use_abs_or_rel_mdot_limit=1 - */ - SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_f_htfmax_nset(SAM_table ptr, double number, SAM_error *err); - - /** - * Set f_htfmin: Minimum loop mass flow rate fraction of design - * options: None - * constraints: None - * required if: use_abs_or_rel_mdot_limit=1 - */ - SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_f_htfmin_nset(SAM_table ptr, double number, SAM_error *err); - - /** - * Set m_dot_htfmax: Maximum loop HTF flow rate [kg/s] - * options: None - * constraints: None - * required if: use_abs_or_rel_mdot_limit=0 - */ - SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_m_dot_htfmax_nset(SAM_table ptr, double number, SAM_error *err); - - /** - * Set m_dot_htfmin: Minimum loop HTF flow rate [kg/s] - * options: None - * constraints: None - * required if: use_abs_or_rel_mdot_limit=0 - */ - SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_m_dot_htfmin_nset(SAM_table ptr, double number, SAM_error *err); + SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_washes_per_year_nset(SAM_table ptr, double number, SAM_error *err); /** - * Set use_abs_or_rel_mdot_limit: Use mass flow abs (0) or relative (1) limits + * Set water_per_wash: Water usage per wash [L/m2_aper] * options: None * constraints: None - * required if: ?=0 + * required if: * */ - SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_use_abs_or_rel_mdot_limit_nset(SAM_table ptr, double number, SAM_error *err); + SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_water_per_wash_nset(SAM_table ptr, double number, SAM_error *err); // @@ -1933,10 +1928,18 @@ extern "C" SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_eta_pump_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_f_htfmax_nget(SAM_table ptr, SAM_error *err); + + SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_f_htfmin_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double* SAM_FresnelPhysicalIph_SolarField_field_fl_props_mget(SAM_table ptr, int* nrows, int* ncols, SAM_error *err); SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_land_mult_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_m_dot_htfmax_nget(SAM_table ptr, SAM_error *err); + + SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_m_dot_htfmin_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_mc_bal_cold_nget(SAM_table ptr, SAM_error *err); SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_mc_bal_hot_nget(SAM_table ptr, SAM_error *err); @@ -1957,26 +1960,13 @@ extern "C" SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_theta_stow_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_use_abs_or_rel_mdot_limit_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_washes_per_year_nget(SAM_table ptr, SAM_error *err); SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_water_per_wash_nget(SAM_table ptr, SAM_error *err); - /** - * SolarField Getters - */ - - SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_f_htfmax_nget(SAM_table ptr, SAM_error *err); - - SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_f_htfmin_nget(SAM_table ptr, SAM_error *err); - - SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_m_dot_htfmax_nget(SAM_table ptr, SAM_error *err); - - SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_m_dot_htfmin_nget(SAM_table ptr, SAM_error *err); - - SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_use_abs_or_rel_mdot_limit_nget(SAM_table ptr, SAM_error *err); - - /** * ColRec Getters */ diff --git a/api/include/SAM_Pvsamv1.h b/api/include/SAM_Pvsamv1.h index 15aae3dd1..14fe70223 100644 --- a/api/include/SAM_Pvsamv1.h +++ b/api/include/SAM_Pvsamv1.h @@ -8217,6 +8217,8 @@ extern "C" SAM_EXPORT double* SAM_Pvsamv1_Outputs_survival_function_aget(SAM_table ptr, int* length, SAM_error *err); + SAM_EXPORT double SAM_Pvsamv1_Outputs_system_capacity_ac_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double* SAM_Pvsamv1_Outputs_system_to_batt_aget(SAM_table ptr, int* length, SAM_error *err); SAM_EXPORT double* SAM_Pvsamv1_Outputs_system_to_batt_dc_aget(SAM_table ptr, int* length, SAM_error *err); diff --git a/api/include/SAM_Pvwattsv8.h b/api/include/SAM_Pvwattsv8.h index 70c4a74e4..6f81ffa32 100644 --- a/api/include/SAM_Pvwattsv8.h +++ b/api/include/SAM_Pvwattsv8.h @@ -741,6 +741,8 @@ extern "C" SAM_EXPORT double* SAM_Pvwattsv8_Outputs_sunup_aget(SAM_table ptr, int* length, SAM_error *err); + SAM_EXPORT double SAM_Pvwattsv8_Outputs_system_capacity_ac_nget(SAM_table ptr, SAM_error *err); + SAM_EXPORT double* SAM_Pvwattsv8_Outputs_tamb_aget(SAM_table ptr, int* length, SAM_error *err); SAM_EXPORT double* SAM_Pvwattsv8_Outputs_tcell_aget(SAM_table ptr, int* length, SAM_error *err); diff --git a/api/modules/SAM_FresnelPhysical.cpp b/api/modules/SAM_FresnelPhysical.cpp index c6d52fe89..c06e4e326 100644 --- a/api/modules/SAM_FresnelPhysical.cpp +++ b/api/modules/SAM_FresnelPhysical.cpp @@ -170,6 +170,18 @@ SAM_EXPORT void SAM_FresnelPhysical_SolarField_eta_pump_nset(SAM_table ptr, doub }); } +SAM_EXPORT void SAM_FresnelPhysical_SolarField_f_htfmax_nset(SAM_table ptr, double number, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_number(ptr, "f_htfmax", number); + }); +} + +SAM_EXPORT void SAM_FresnelPhysical_SolarField_f_htfmin_nset(SAM_table ptr, double number, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_number(ptr, "f_htfmin", number); + }); +} + SAM_EXPORT void SAM_FresnelPhysical_SolarField_field_fl_props_mset(SAM_table ptr, double* mat, int nrows, int ncols, SAM_error *err){ translateExceptions(err, [&]{ ssc_data_set_matrix(ptr, "field_fl_props", mat, nrows, ncols); @@ -182,6 +194,18 @@ SAM_EXPORT void SAM_FresnelPhysical_SolarField_land_mult_nset(SAM_table ptr, dou }); } +SAM_EXPORT void SAM_FresnelPhysical_SolarField_m_dot_htfmax_nset(SAM_table ptr, double number, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_number(ptr, "m_dot_htfmax", number); + }); +} + +SAM_EXPORT void SAM_FresnelPhysical_SolarField_m_dot_htfmin_nset(SAM_table ptr, double number, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_number(ptr, "m_dot_htfmin", number); + }); +} + SAM_EXPORT void SAM_FresnelPhysical_SolarField_mc_bal_cold_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ ssc_data_set_number(ptr, "mc_bal_cold", number); @@ -230,45 +254,21 @@ SAM_EXPORT void SAM_FresnelPhysical_SolarField_theta_stow_nset(SAM_table ptr, do }); } -SAM_EXPORT void SAM_FresnelPhysical_SolarField_washes_per_year_nset(SAM_table ptr, double number, SAM_error *err){ - translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "washes_per_year", number); - }); -} - -SAM_EXPORT void SAM_FresnelPhysical_SolarField_water_per_wash_nset(SAM_table ptr, double number, SAM_error *err){ - translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "water_per_wash", number); - }); -} - -SAM_EXPORT void SAM_FresnelPhysical_SolarField_f_htfmax_nset(SAM_table ptr, double number, SAM_error *err){ - translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "f_htfmax", number); - }); -} - -SAM_EXPORT void SAM_FresnelPhysical_SolarField_f_htfmin_nset(SAM_table ptr, double number, SAM_error *err){ - translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "f_htfmin", number); - }); -} - -SAM_EXPORT void SAM_FresnelPhysical_SolarField_m_dot_htfmax_nset(SAM_table ptr, double number, SAM_error *err){ +SAM_EXPORT void SAM_FresnelPhysical_SolarField_use_abs_or_rel_mdot_limit_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "m_dot_htfmax", number); + ssc_data_set_number(ptr, "use_abs_or_rel_mdot_limit", number); }); } -SAM_EXPORT void SAM_FresnelPhysical_SolarField_m_dot_htfmin_nset(SAM_table ptr, double number, SAM_error *err){ +SAM_EXPORT void SAM_FresnelPhysical_SolarField_washes_per_year_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "m_dot_htfmin", number); + ssc_data_set_number(ptr, "washes_per_year", number); }); } -SAM_EXPORT void SAM_FresnelPhysical_SolarField_use_abs_or_rel_mdot_limit_nset(SAM_table ptr, double number, SAM_error *err){ +SAM_EXPORT void SAM_FresnelPhysical_SolarField_water_per_wash_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "use_abs_or_rel_mdot_limit", number); + ssc_data_set_number(ptr, "water_per_wash", number); }); } @@ -1491,6 +1491,24 @@ SAM_EXPORT double SAM_FresnelPhysical_SolarField_eta_pump_nget(SAM_table ptr, SA return result; } +SAM_EXPORT double SAM_FresnelPhysical_SolarField_f_htfmax_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "f_htfmax", &result)) + make_access_error("SAM_FresnelPhysical", "f_htfmax"); + }); + return result; +} + +SAM_EXPORT double SAM_FresnelPhysical_SolarField_f_htfmin_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "f_htfmin", &result)) + make_access_error("SAM_FresnelPhysical", "f_htfmin"); + }); + return result; +} + SAM_EXPORT double* SAM_FresnelPhysical_SolarField_field_fl_props_mget(SAM_table ptr, int* nrows, int* ncols, SAM_error *err){ double* result = nullptr; translateExceptions(err, [&]{ @@ -1510,6 +1528,24 @@ SAM_EXPORT double SAM_FresnelPhysical_SolarField_land_mult_nget(SAM_table ptr, S return result; } +SAM_EXPORT double SAM_FresnelPhysical_SolarField_m_dot_htfmax_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "m_dot_htfmax", &result)) + make_access_error("SAM_FresnelPhysical", "m_dot_htfmax"); + }); + return result; +} + +SAM_EXPORT double SAM_FresnelPhysical_SolarField_m_dot_htfmin_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "m_dot_htfmin", &result)) + make_access_error("SAM_FresnelPhysical", "m_dot_htfmin"); + }); + return result; +} + SAM_EXPORT double SAM_FresnelPhysical_SolarField_mc_bal_cold_nget(SAM_table ptr, SAM_error *err){ double result; translateExceptions(err, [&]{ @@ -1582,65 +1618,29 @@ SAM_EXPORT double SAM_FresnelPhysical_SolarField_theta_stow_nget(SAM_table ptr, return result; } -SAM_EXPORT double SAM_FresnelPhysical_SolarField_washes_per_year_nget(SAM_table ptr, SAM_error *err){ - double result; - translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "washes_per_year", &result)) - make_access_error("SAM_FresnelPhysical", "washes_per_year"); - }); - return result; -} - -SAM_EXPORT double SAM_FresnelPhysical_SolarField_water_per_wash_nget(SAM_table ptr, SAM_error *err){ - double result; - translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "water_per_wash", &result)) - make_access_error("SAM_FresnelPhysical", "water_per_wash"); - }); - return result; -} - -SAM_EXPORT double SAM_FresnelPhysical_SolarField_f_htfmax_nget(SAM_table ptr, SAM_error *err){ - double result; - translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "f_htfmax", &result)) - make_access_error("SAM_FresnelPhysical", "f_htfmax"); - }); - return result; -} - -SAM_EXPORT double SAM_FresnelPhysical_SolarField_f_htfmin_nget(SAM_table ptr, SAM_error *err){ - double result; - translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "f_htfmin", &result)) - make_access_error("SAM_FresnelPhysical", "f_htfmin"); - }); - return result; -} - -SAM_EXPORT double SAM_FresnelPhysical_SolarField_m_dot_htfmax_nget(SAM_table ptr, SAM_error *err){ +SAM_EXPORT double SAM_FresnelPhysical_SolarField_use_abs_or_rel_mdot_limit_nget(SAM_table ptr, SAM_error *err){ double result; translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "m_dot_htfmax", &result)) - make_access_error("SAM_FresnelPhysical", "m_dot_htfmax"); + if (!ssc_data_get_number(ptr, "use_abs_or_rel_mdot_limit", &result)) + make_access_error("SAM_FresnelPhysical", "use_abs_or_rel_mdot_limit"); }); return result; } -SAM_EXPORT double SAM_FresnelPhysical_SolarField_m_dot_htfmin_nget(SAM_table ptr, SAM_error *err){ +SAM_EXPORT double SAM_FresnelPhysical_SolarField_washes_per_year_nget(SAM_table ptr, SAM_error *err){ double result; translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "m_dot_htfmin", &result)) - make_access_error("SAM_FresnelPhysical", "m_dot_htfmin"); + if (!ssc_data_get_number(ptr, "washes_per_year", &result)) + make_access_error("SAM_FresnelPhysical", "washes_per_year"); }); return result; } -SAM_EXPORT double SAM_FresnelPhysical_SolarField_use_abs_or_rel_mdot_limit_nget(SAM_table ptr, SAM_error *err){ +SAM_EXPORT double SAM_FresnelPhysical_SolarField_water_per_wash_nget(SAM_table ptr, SAM_error *err){ double result; translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "use_abs_or_rel_mdot_limit", &result)) - make_access_error("SAM_FresnelPhysical", "use_abs_or_rel_mdot_limit"); + if (!ssc_data_get_number(ptr, "water_per_wash", &result)) + make_access_error("SAM_FresnelPhysical", "water_per_wash"); }); return result; } diff --git a/api/modules/SAM_FresnelPhysicalIph.cpp b/api/modules/SAM_FresnelPhysicalIph.cpp index 09c06ac40..02b06f85c 100644 --- a/api/modules/SAM_FresnelPhysicalIph.cpp +++ b/api/modules/SAM_FresnelPhysicalIph.cpp @@ -158,6 +158,18 @@ SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_eta_pump_nset(SAM_table ptr, d }); } +SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_f_htfmax_nset(SAM_table ptr, double number, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_number(ptr, "f_htfmax", number); + }); +} + +SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_f_htfmin_nset(SAM_table ptr, double number, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_number(ptr, "f_htfmin", number); + }); +} + SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_field_fl_props_mset(SAM_table ptr, double* mat, int nrows, int ncols, SAM_error *err){ translateExceptions(err, [&]{ ssc_data_set_matrix(ptr, "field_fl_props", mat, nrows, ncols); @@ -170,6 +182,18 @@ SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_land_mult_nset(SAM_table ptr, }); } +SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_m_dot_htfmax_nset(SAM_table ptr, double number, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_number(ptr, "m_dot_htfmax", number); + }); +} + +SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_m_dot_htfmin_nset(SAM_table ptr, double number, SAM_error *err){ + translateExceptions(err, [&]{ + ssc_data_set_number(ptr, "m_dot_htfmin", number); + }); +} + SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_mc_bal_cold_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ ssc_data_set_number(ptr, "mc_bal_cold", number); @@ -230,45 +254,21 @@ SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_theta_stow_nset(SAM_table ptr, }); } -SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_washes_per_year_nset(SAM_table ptr, double number, SAM_error *err){ - translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "washes_per_year", number); - }); -} - -SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_water_per_wash_nset(SAM_table ptr, double number, SAM_error *err){ - translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "water_per_wash", number); - }); -} - -SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_f_htfmax_nset(SAM_table ptr, double number, SAM_error *err){ - translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "f_htfmax", number); - }); -} - -SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_f_htfmin_nset(SAM_table ptr, double number, SAM_error *err){ - translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "f_htfmin", number); - }); -} - -SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_m_dot_htfmax_nset(SAM_table ptr, double number, SAM_error *err){ +SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_use_abs_or_rel_mdot_limit_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "m_dot_htfmax", number); + ssc_data_set_number(ptr, "use_abs_or_rel_mdot_limit", number); }); } -SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_m_dot_htfmin_nset(SAM_table ptr, double number, SAM_error *err){ +SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_washes_per_year_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "m_dot_htfmin", number); + ssc_data_set_number(ptr, "washes_per_year", number); }); } -SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_use_abs_or_rel_mdot_limit_nset(SAM_table ptr, double number, SAM_error *err){ +SAM_EXPORT void SAM_FresnelPhysicalIph_SolarField_water_per_wash_nset(SAM_table ptr, double number, SAM_error *err){ translateExceptions(err, [&]{ - ssc_data_set_number(ptr, "use_abs_or_rel_mdot_limit", number); + ssc_data_set_number(ptr, "water_per_wash", number); }); } @@ -1539,6 +1539,24 @@ SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_eta_pump_nget(SAM_table ptr, return result; } +SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_f_htfmax_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "f_htfmax", &result)) + make_access_error("SAM_FresnelPhysicalIph", "f_htfmax"); + }); + return result; +} + +SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_f_htfmin_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "f_htfmin", &result)) + make_access_error("SAM_FresnelPhysicalIph", "f_htfmin"); + }); + return result; +} + SAM_EXPORT double* SAM_FresnelPhysicalIph_SolarField_field_fl_props_mget(SAM_table ptr, int* nrows, int* ncols, SAM_error *err){ double* result = nullptr; translateExceptions(err, [&]{ @@ -1558,6 +1576,24 @@ SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_land_mult_nget(SAM_table ptr return result; } +SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_m_dot_htfmax_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "m_dot_htfmax", &result)) + make_access_error("SAM_FresnelPhysicalIph", "m_dot_htfmax"); + }); + return result; +} + +SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_m_dot_htfmin_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "m_dot_htfmin", &result)) + make_access_error("SAM_FresnelPhysicalIph", "m_dot_htfmin"); + }); + return result; +} + SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_mc_bal_cold_nget(SAM_table ptr, SAM_error *err){ double result; translateExceptions(err, [&]{ @@ -1648,65 +1684,29 @@ SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_theta_stow_nget(SAM_table pt return result; } -SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_washes_per_year_nget(SAM_table ptr, SAM_error *err){ - double result; - translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "washes_per_year", &result)) - make_access_error("SAM_FresnelPhysicalIph", "washes_per_year"); - }); - return result; -} - -SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_water_per_wash_nget(SAM_table ptr, SAM_error *err){ - double result; - translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "water_per_wash", &result)) - make_access_error("SAM_FresnelPhysicalIph", "water_per_wash"); - }); - return result; -} - -SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_f_htfmax_nget(SAM_table ptr, SAM_error *err){ - double result; - translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "f_htfmax", &result)) - make_access_error("SAM_FresnelPhysicalIph", "f_htfmax"); - }); - return result; -} - -SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_f_htfmin_nget(SAM_table ptr, SAM_error *err){ - double result; - translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "f_htfmin", &result)) - make_access_error("SAM_FresnelPhysicalIph", "f_htfmin"); - }); - return result; -} - -SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_m_dot_htfmax_nget(SAM_table ptr, SAM_error *err){ +SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_use_abs_or_rel_mdot_limit_nget(SAM_table ptr, SAM_error *err){ double result; translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "m_dot_htfmax", &result)) - make_access_error("SAM_FresnelPhysicalIph", "m_dot_htfmax"); + if (!ssc_data_get_number(ptr, "use_abs_or_rel_mdot_limit", &result)) + make_access_error("SAM_FresnelPhysicalIph", "use_abs_or_rel_mdot_limit"); }); return result; } -SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_m_dot_htfmin_nget(SAM_table ptr, SAM_error *err){ +SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_washes_per_year_nget(SAM_table ptr, SAM_error *err){ double result; translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "m_dot_htfmin", &result)) - make_access_error("SAM_FresnelPhysicalIph", "m_dot_htfmin"); + if (!ssc_data_get_number(ptr, "washes_per_year", &result)) + make_access_error("SAM_FresnelPhysicalIph", "washes_per_year"); }); return result; } -SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_use_abs_or_rel_mdot_limit_nget(SAM_table ptr, SAM_error *err){ +SAM_EXPORT double SAM_FresnelPhysicalIph_SolarField_water_per_wash_nget(SAM_table ptr, SAM_error *err){ double result; translateExceptions(err, [&]{ - if (!ssc_data_get_number(ptr, "use_abs_or_rel_mdot_limit", &result)) - make_access_error("SAM_FresnelPhysicalIph", "use_abs_or_rel_mdot_limit"); + if (!ssc_data_get_number(ptr, "water_per_wash", &result)) + make_access_error("SAM_FresnelPhysicalIph", "water_per_wash"); }); return result; } diff --git a/api/modules/SAM_Pvsamv1.cpp b/api/modules/SAM_Pvsamv1.cpp index 924e3bce4..3e59d6134 100644 --- a/api/modules/SAM_Pvsamv1.cpp +++ b/api/modules/SAM_Pvsamv1.cpp @@ -14897,6 +14897,15 @@ SAM_EXPORT double* SAM_Pvsamv1_Outputs_survival_function_aget(SAM_table ptr, int return result; } +SAM_EXPORT double SAM_Pvsamv1_Outputs_system_capacity_ac_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "system_capacity_ac", &result)) + make_access_error("SAM_Pvsamv1", "system_capacity_ac"); + }); + return result; +} + SAM_EXPORT double* SAM_Pvsamv1_Outputs_system_to_batt_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 index dee26c160..4a2f312d4 100644 --- a/api/modules/SAM_Pvwattsv8.cpp +++ b/api/modules/SAM_Pvwattsv8.cpp @@ -1342,6 +1342,15 @@ SAM_EXPORT double* SAM_Pvwattsv8_Outputs_sunup_aget(SAM_table ptr, int* length, return result; } +SAM_EXPORT double SAM_Pvwattsv8_Outputs_system_capacity_ac_nget(SAM_table ptr, SAM_error *err){ + double result; + translateExceptions(err, [&]{ + if (!ssc_data_get_number(ptr, "system_capacity_ac", &result)) + make_access_error("SAM_Pvwattsv8", "system_capacity_ac"); + }); + return result; +} + SAM_EXPORT double* SAM_Pvwattsv8_Outputs_tamb_aget(SAM_table ptr, int* length, SAM_error *err){ double* result = nullptr; translateExceptions(err, [&]{ diff --git a/src/main_add.h b/src/main_add.h index 2cb262769..9a8a36a16 100644 --- a/src/main_add.h +++ b/src/main_add.h @@ -74,7 +74,7 @@ static SamApp::ver releases[] = { //intermediate version numbers are required in this list in order for the version upgrade script (versions.lk) to work correctly //please clarify the reason for the new version in a comment. Examples: public release, variable changes, internal release, public beta release, etc. //the top version should always be the current working version - { 2024, 12, 12}, // 2024.12.12 ssc 296 release candidate for testing expires 1/31/2025 + { 2024, 12, 12}, // 2024.12.12 ssc 297 release candidate - no expiration { 2024, 11, 14}, // 2024.11.14 ssc 295 beta release for IPH configurations expires 1/31/2025 { 2024, 9, 15}, // 2024.09.15 Placeholder version number for updated NT variable names (replace with release version number) { 2024, 9, 11}, // 2024.09.11 Final Norwich beta