Latest api updates from develop, too.

NREL · Dec 5, 2024 · 1495a99 · 1495a99
1 parent d9915b4
commit 1495a99
Show file tree

Hide file tree

Showing 35 changed files with 752 additions and 1 deletion.
diff --git a/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHCommercial.json b/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHCommercial.json
@@ -126,6 +126,14 @@
 			"reflectivity": 0.935
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"Storage": {

diff --git a/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHLCOHCalculator.json b/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHLCOHCalculator.json
@@ -126,6 +126,14 @@
 			"reflectivity": 0.935
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"Storage": {

diff --git a/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHNone.json b/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHNone.json
@@ -126,6 +126,14 @@
 			"reflectivity": 0.935
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"Storage": {

diff --git a/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHSingleOwner.json b/api/api_autogen/library/defaults/FresnelPhysicalIph_MSLFIPHSingleOwner.json
@@ -126,6 +126,14 @@
 			"reflectivity": 0.935
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"Storage": {

diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFAllEquityPartnershipFlip.json
@@ -332,6 +332,7 @@
 				[545.000000, 1.000000, 52.105300, 1.082840, 1.086210, 1.000000, 1.000000],
 				[545.000000, 1.000000, 55.000000, 1.074640, 1.086210, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"Storage": {

diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFLeveragedPartnershipFlip.json
@@ -332,6 +332,7 @@
 				[545.000000, 1.000000, 52.105300, 1.082840, 1.086210, 1.000000, 1.000000],
 				[545.000000, 1.000000, 55.000000, 1.074640, 1.086210, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"Storage": {

diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFMerchantPlant.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFMerchantPlant.json
@@ -332,6 +332,7 @@
 				[545.000000, 1.000000, 52.105300, 1.082840, 1.086210, 1.000000, 1.000000],
 				[545.000000, 1.000000, 55.000000, 1.074640, 1.086210, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"Storage": {

diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFSaleLeaseback.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFSaleLeaseback.json
@@ -332,6 +332,7 @@
 				[545.000000, 1.000000, 52.105300, 1.082840, 1.086210, 1.000000, 1.000000],
 				[545.000000, 1.000000, 55.000000, 1.074640, 1.086210, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"Storage": {

diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFSingleOwner.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFSingleOwner.json
@@ -332,6 +332,7 @@
 				[545.000000, 1.000000, 52.105300, 1.082840, 1.086210, 1.000000, 1.000000],
 				[545.000000, 1.000000, 55.000000, 1.074640, 1.086210, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"Storage": {

diff --git a/api/api_autogen/library/defaults/MsptIph_MSPTIPHLCOHCalculator.json b/api/api_autogen/library/defaults/MsptIph_MSPTIPHLCOHCalculator.json
@@ -9533,6 +9533,14 @@
 			"u_tank": 0.4
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"TimeOfDeliveryFactors": {

diff --git a/api/api_autogen/library/defaults/MsptIph_MSPTIPHNone.json b/api/api_autogen/library/defaults/MsptIph_MSPTIPHNone.json
@@ -9533,6 +9533,14 @@
 			"u_tank": 0.4
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"TimeOfDeliveryFactors": {

diff --git a/api/api_autogen/library/defaults/MsptIph_MSPTIPHSingleOwner.json b/api/api_autogen/library/defaults/MsptIph_MSPTIPHSingleOwner.json
@@ -9533,6 +9533,14 @@
 			"u_tank": 0.4
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"TimeOfDeliveryFactors": {

diff --git a/api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHCommercial.json b/api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHCommercial.json
@@ -309,6 +309,14 @@
 			"wind_stow_speed": 25
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"ParallelHeater": {

diff --git a/api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHLCOHCalculator.json b/api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHLCOHCalculator.json
@@ -309,6 +309,14 @@
 			"wind_stow_speed": 25
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"ParallelHeater": {

diff --git a/api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHNone.json b/api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHNone.json
@@ -309,6 +309,14 @@
 			"wind_stow_speed": 25
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"ParallelHeater": {

diff --git a/api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHSingleOwner.json b/api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHSingleOwner.json
@@ -309,6 +309,14 @@
 			"wind_stow_speed": 25
 		},
 		"HeatSink": {
+			"hs_phys_N_sub": 100,
+			"hs_phys_P_steam_hot_des": 4.762,
+			"hs_phys_Q_steam_hot_des": 0.75,
+			"hs_phys_T_steam_cold_des": 120,
+			"hs_phys_f_mdot_steam_max": 1.5,
+			"hs_phys_f_mdot_steam_min": 0.2,
+			"hs_phys_tol": 0.01,
+			"hs_type": 0,
 			"pb_pump_coef": 0.55
 		},
 		"ParallelHeater": {

diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughAllEquityPartnershipFlip.json
@@ -503,6 +503,7 @@
 				[410.000000, 1.000000, 52.105300, 1.193630, 1.193880, 1.000000, 1.000000],
 				[410.000000, 1.000000, 55.000000, 1.181830, 1.193880, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"TES": {

diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughCommercial.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughCommercial.json
@@ -395,6 +395,7 @@
 				[295.000000, 0.700000, 50.000000, 0.417358, 0.630000, 1.000000, 1.000000],
 				[295.000000, 0.700000, 55.000000, 0.369147, 0.616000, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"TES": {

diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughLCOECalculator.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughLCOECalculator.json
@@ -503,6 +503,7 @@
 				[410.000000, 1.000000, 52.105300, 1.193630, 1.193880, 1.000000, 1.000000],
 				[410.000000, 1.000000, 55.000000, 1.181830, 1.193880, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"TES": {

diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughLeveragedPartnershipFlip.json
@@ -503,6 +503,7 @@
 				[410.000000, 1.000000, 52.105300, 1.193630, 1.193880, 1.000000, 1.000000],
 				[410.000000, 1.000000, 55.000000, 1.181830, 1.193880, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"TES": {

diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughMerchantPlant.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughMerchantPlant.json
@@ -503,6 +503,7 @@
 				[410.000000, 1.000000, 52.105300, 1.193630, 1.193880, 1.000000, 1.000000],
 				[410.000000, 1.000000, 55.000000, 1.181830, 1.193880, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"TES": {

diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughNone.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughNone.json
@@ -503,6 +503,7 @@
 				[410.000000, 1.000000, 52.105300, 1.193630, 1.193880, 1.000000, 1.000000],
 				[410.000000, 1.000000, 55.000000, 1.181830, 1.193880, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"TES": {

diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughSaleLeaseback.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughSaleLeaseback.json
@@ -503,6 +503,7 @@
 				[410.000000, 1.000000, 52.105300, 1.193630, 1.193880, 1.000000, 1.000000],
 				[410.000000, 1.000000, 55.000000, 1.181830, 1.193880, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"TES": {

diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughSingleOwner.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughSingleOwner.json
@@ -503,6 +503,7 @@
 				[410.000000, 1.000000, 52.105300, 1.193630, 1.193880, 1.000000, 1.000000],
 				[410.000000, 1.000000, 55.000000, 1.181830, 1.193880, 1.000000, 1.000000]
 			],
+			"ud_is_sco2_regr": 0,
 			"ud_m_dot_water_cool_des": 0
 		},
 		"TES": {

diff --git a/api/include/SAM_FresnelPhysical.h b/api/include/SAM_FresnelPhysical.h
@@ -938,6 +938,14 @@ extern "C"
 	 */
 	SAM_EXPORT void SAM_FresnelPhysical_UserDefinedPC_ud_ind_od_mset(SAM_table ptr, double* mat, int nrows, int ncols, SAM_error *err);
 
+	/**
+	 * Set ud_is_sco2_regr: 0: (default) simple max htf mass flow correction; 1: sco2 heuristic regression; 2: no correction
+	 * options: None
+	 * constraints: None
+	 * required if: ?=0
+	 */
+	SAM_EXPORT void SAM_FresnelPhysical_UserDefinedPC_ud_is_sco2_regr_nset(SAM_table ptr, double number, SAM_error *err);
+
 	/**
 	 * Set ud_m_dot_water_cool_des: Mass flow rate of water required at user-defined power cycle design point [kg/s]
 	 * options: None
@@ -2027,6 +2035,8 @@ extern "C"
 
 	SAM_EXPORT double* SAM_FresnelPhysical_UserDefinedPC_ud_ind_od_mget(SAM_table ptr, int* nrows, int* ncols, SAM_error *err);
 
+	SAM_EXPORT double SAM_FresnelPhysical_UserDefinedPC_ud_is_sco2_regr_nget(SAM_table ptr, SAM_error *err);
+
 	SAM_EXPORT double SAM_FresnelPhysical_UserDefinedPC_ud_m_dot_water_cool_des_nget(SAM_table ptr, SAM_error *err);
 
 

diff --git a/api/include/SAM_FresnelPhysicalIph.h b/api/include/SAM_FresnelPhysicalIph.h
@@ -749,6 +749,70 @@ extern "C"
 	// HeatSink parameters
 	//
 
+	/**
+	 * Set hs_phys_N_sub: Number physical heat sink HX nodes
+	 * options: None
+	 * constraints: None
+	 * required if: hs_type=1
+	 */
+	SAM_EXPORT void SAM_FresnelPhysicalIph_HeatSink_hs_phys_N_sub_nset(SAM_table ptr, double number, SAM_error *err);
+
+	/**
+	 * Set hs_phys_P_steam_hot_des: Steam outlet (and inlet) pressure for physical heat sink [bar]
+	 * options: None
+	 * constraints: None
+	 * required if: hs_type=1
+	 */
+	SAM_EXPORT void SAM_FresnelPhysicalIph_HeatSink_hs_phys_P_steam_hot_des_nset(SAM_table ptr, double number, SAM_error *err);
+
+	/**
+	 * Set hs_phys_Q_steam_hot_des: Steam outlet quality for physical heat sink
+	 * options: None
+	 * constraints: None
+	 * required if: hs_type=1
+	 */
+	SAM_EXPORT void SAM_FresnelPhysicalIph_HeatSink_hs_phys_Q_steam_hot_des_nset(SAM_table ptr, double number, SAM_error *err);
+
+	/**
+	 * Set hs_phys_T_steam_cold_des: Steam inlet temperature for physical heat sink [C]
+	 * options: None
+	 * constraints: None
+	 * required if: hs_type=1
+	 */
+	SAM_EXPORT void SAM_FresnelPhysicalIph_HeatSink_hs_phys_T_steam_cold_des_nset(SAM_table ptr, double number, SAM_error *err);
+
+	/**
+	 * Set hs_phys_f_mdot_steam_max: Max steam mdot fraction for physical heat sink
+	 * options: None
+	 * constraints: None
+	 * required if: hs_type=1
+	 */
+	SAM_EXPORT void SAM_FresnelPhysicalIph_HeatSink_hs_phys_f_mdot_steam_max_nset(SAM_table ptr, double number, SAM_error *err);
+
+	/**
+	 * Set hs_phys_f_mdot_steam_min: Min steam mdot fraction for physical heat sink
+	 * options: None
+	 * constraints: None
+	 * required if: hs_type=1
+	 */
+	SAM_EXPORT void SAM_FresnelPhysicalIph_HeatSink_hs_phys_f_mdot_steam_min_nset(SAM_table ptr, double number, SAM_error *err);
+
+	/**
+	 * Set hs_phys_tol: Physical heat sink solve tolerance
+	 * options: None
+	 * constraints: None
+	 * required if: hs_type=1
+	 */
+	SAM_EXPORT void SAM_FresnelPhysicalIph_HeatSink_hs_phys_tol_nset(SAM_table ptr, double number, SAM_error *err);
+
+	/**
+	 * Set hs_type: 0: ideal model, 1: physical steam model
+	 * options: None
+	 * constraints: None
+	 * required if: ?=0
+	 */
+	SAM_EXPORT void SAM_FresnelPhysicalIph_HeatSink_hs_type_nset(SAM_table ptr, double number, SAM_error *err);
+
 	/**
 	 * Set pb_pump_coef: Pumping power to move 1kg of HTF through PB loop [kW/kg]
 	 * options: None
@@ -2008,6 +2072,22 @@ extern "C"
 	 * HeatSink Getters
 	 */
 
+	SAM_EXPORT double SAM_FresnelPhysicalIph_HeatSink_hs_phys_N_sub_nget(SAM_table ptr, SAM_error *err);
+
+	SAM_EXPORT double SAM_FresnelPhysicalIph_HeatSink_hs_phys_P_steam_hot_des_nget(SAM_table ptr, SAM_error *err);
+
+	SAM_EXPORT double SAM_FresnelPhysicalIph_HeatSink_hs_phys_Q_steam_hot_des_nget(SAM_table ptr, SAM_error *err);
+
+	SAM_EXPORT double SAM_FresnelPhysicalIph_HeatSink_hs_phys_T_steam_cold_des_nget(SAM_table ptr, SAM_error *err);
+
+	SAM_EXPORT double SAM_FresnelPhysicalIph_HeatSink_hs_phys_f_mdot_steam_max_nget(SAM_table ptr, SAM_error *err);
+
+	SAM_EXPORT double SAM_FresnelPhysicalIph_HeatSink_hs_phys_f_mdot_steam_min_nget(SAM_table ptr, SAM_error *err);
+
+	SAM_EXPORT double SAM_FresnelPhysicalIph_HeatSink_hs_phys_tol_nget(SAM_table ptr, SAM_error *err);
+
+	SAM_EXPORT double SAM_FresnelPhysicalIph_HeatSink_hs_type_nget(SAM_table ptr, SAM_error *err);
+
 	SAM_EXPORT double SAM_FresnelPhysicalIph_HeatSink_pb_pump_coef_nget(SAM_table ptr, SAM_error *err);