Make requested changes in #1950

sjanzou · sjanzou · commit add75313cfd3 · 2024-12-08T01:59:27.000-07:00
diff --git a/api/api_autogen/library/defaults/FresnelPhysical_MSLFAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/FresnelPhysical_MSLFAllEquityPartnershipFlip.json
@@ -40,8 +40,6 @@
 			"nMod": 8,
 			"p_start": 0.021,
 			"rec_htf_vol": 1,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"theta_dep": 10,
 			"theta_stow": 170,
 			"washes_per_year": 120,
@@ -376,6 +374,8 @@
 			"disp_timeout": 5,
 			"is_dispatch": 0,
 			"pb_fixed_par": 0.0055,
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"weekday_schedule": [
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 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
@@ -40,8 +40,6 @@
 			"nMod": 8,
 			"p_start": 0.021,
 			"rec_htf_vol": 1,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"theta_dep": 10,
 			"theta_stow": 170,
 			"washes_per_year": 120,
@@ -376,6 +374,8 @@
 			"disp_timeout": 5,
 			"is_dispatch": 0,
 			"pb_fixed_par": 0.0055,
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"weekday_schedule": [
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 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
@@ -40,8 +40,6 @@
 			"nMod": 8,
 			"p_start": 0.021,
 			"rec_htf_vol": 1,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"theta_dep": 10,
 			"theta_stow": 170,
 			"washes_per_year": 120,
@@ -374,6 +372,8 @@
 			"disp_timeout": 5,
 			"is_dispatch": 0,
 			"pb_fixed_par": 0.0055,
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"weekday_schedule": [
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 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
@@ -40,8 +40,6 @@
 			"nMod": 8,
 			"p_start": 0.021,
 			"rec_htf_vol": 1,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"theta_dep": 10,
 			"theta_stow": 170,
 			"washes_per_year": 120,
@@ -376,6 +374,8 @@
 			"disp_timeout": 5,
 			"is_dispatch": 0,
 			"pb_fixed_par": 0.0055,
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"weekday_schedule": [
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 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
@@ -40,8 +40,6 @@
 			"nMod": 8,
 			"p_start": 0.021,
 			"rec_htf_vol": 1,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"theta_dep": 10,
 			"theta_stow": 170,
 			"washes_per_year": 120,
@@ -376,6 +374,8 @@
 			"disp_timeout": 5,
 			"is_dispatch": 0,
 			"pb_fixed_par": 0.0055,
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"weekday_schedule": [
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
 				[1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000, 1.000000],
diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughAllEquityPartnershipFlip.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughAllEquityPartnershipFlip.json
@@ -1,6 +1,8 @@
 {
 	"defaults": {
 		"SystemControl": {
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"time_start": 0,
 			"time_stop": 3.1536e+07
 		},
@@ -272,8 +274,6 @@
 			"northsouth_field_sep": 20,
 			"offset_xpan_hdr": 1,
 			"p_start": 0.021,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"sf_hdr_diams": [
 				[-1.000000]
 			],
diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughCommercial.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughCommercial.json
@@ -1,6 +1,8 @@
 {
 	"defaults": {
 		"SystemControl": {
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"time_start": 0,
 			"time_stop": 3.1536e+07
 		},
@@ -272,8 +274,6 @@
 			"northsouth_field_sep": 20,
 			"offset_xpan_hdr": 1,
 			"p_start": 0.021,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"sf_hdr_diams": [
 				[-1.000000]
 			],
diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughLCOECalculator.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughLCOECalculator.json
@@ -1,6 +1,8 @@
 {
 	"defaults": {
 		"SystemControl": {
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"time_start": 0,
 			"time_stop": 3.1536e+07
 		},
@@ -272,8 +274,6 @@
 			"northsouth_field_sep": 20,
 			"offset_xpan_hdr": 1,
 			"p_start": 0.021,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"sf_hdr_diams": [
 				[-1.000000]
 			],
diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughLeveragedPartnershipFlip.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughLeveragedPartnershipFlip.json
@@ -1,6 +1,8 @@
 {
 	"defaults": {
 		"SystemControl": {
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"time_start": 0,
 			"time_stop": 3.1536e+07
 		},
@@ -272,8 +274,6 @@
 			"northsouth_field_sep": 20,
 			"offset_xpan_hdr": 1,
 			"p_start": 0.021,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"sf_hdr_diams": [
 				[-1.000000]
 			],
diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughMerchantPlant.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughMerchantPlant.json
@@ -1,6 +1,8 @@
 {
 	"defaults": {
 		"SystemControl": {
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"time_start": 0,
 			"time_stop": 3.1536e+07
 		},
@@ -272,8 +274,6 @@
 			"northsouth_field_sep": 20,
 			"offset_xpan_hdr": 1,
 			"p_start": 0.021,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"sf_hdr_diams": [
 				[-1.000000]
 			],
diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughNone.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughNone.json
@@ -1,6 +1,8 @@
 {
 	"defaults": {
 		"SystemControl": {
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"time_start": 0,
 			"time_stop": 3.1536e+07
 		},
@@ -272,8 +274,6 @@
 			"northsouth_field_sep": 20,
 			"offset_xpan_hdr": 1,
 			"p_start": 0.021,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"sf_hdr_diams": [
 				[-1.000000]
 			],
diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughSaleLeaseback.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughSaleLeaseback.json
@@ -1,6 +1,8 @@
 {
 	"defaults": {
 		"SystemControl": {
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"time_start": 0,
 			"time_stop": 3.1536e+07
 		},
@@ -272,8 +274,6 @@
 			"northsouth_field_sep": 20,
 			"offset_xpan_hdr": 1,
 			"p_start": 0.021,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"sf_hdr_diams": [
 				[-1.000000]
 			],
diff --git a/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughSingleOwner.json b/api/api_autogen/library/defaults/TroughPhysical_PhysicalTroughSingleOwner.json
@@ -1,6 +1,8 @@
 {
 	"defaults": {
 		"SystemControl": {
+			"rec_qf_delay": 0.25,
+			"rec_su_delay": 0.2,
 			"time_start": 0,
 			"time_stop": 3.1536e+07
 		},
@@ -272,8 +274,6 @@
 			"northsouth_field_sep": 20,
 			"offset_xpan_hdr": 1,
 			"p_start": 0.021,
-			"rec_qf_delay": 0.25,
-			"rec_su_delay": 0.2,
 			"sf_hdr_diams": [
 				[-1.000000]
 			],
diff --git a/api/include/SAM_FresnelPhysical.h b/api/include/SAM_FresnelPhysical.h
@@ -318,22 +318,6 @@ extern "C"
 	 */
 	SAM_EXPORT void SAM_FresnelPhysical_SolarField_rec_htf_vol_nset(SAM_table ptr, double number, SAM_error *err);
 
-	/**
-	 * Set rec_qf_delay: Energy-based receiver startup delay (fraction of rated thermal power) [-]
-	 * options: None
-	 * constraints: None
-	 * required if: *
-	 */
-	SAM_EXPORT void SAM_FresnelPhysical_SolarField_rec_qf_delay_nset(SAM_table ptr, double number, SAM_error *err);
-
-	/**
-	 * Set rec_su_delay: Fixed startup delay time for the receiver [hr]
-	 * options: None
-	 * constraints: None
-	 * required if: *
-	 */
-	SAM_EXPORT void SAM_FresnelPhysical_SolarField_rec_su_delay_nset(SAM_table ptr, double number, SAM_error *err);
-
 	/**
 	 * Set theta_dep: deploy angle [deg]
 	 * options: None
@@ -1313,6 +1297,22 @@ extern "C"
 	 */
 	SAM_EXPORT void SAM_FresnelPhysical_SysControl_pb_fixed_par_nset(SAM_table ptr, double number, SAM_error *err);
 
+	/**
+	 * Set rec_qf_delay: Energy-based receiver startup delay (fraction of rated thermal power) [-]
+	 * options: None
+	 * constraints: None
+	 * required if: *
+	 */
+	SAM_EXPORT void SAM_FresnelPhysical_SysControl_rec_qf_delay_nset(SAM_table ptr, double number, SAM_error *err);
+
+	/**
+	 * Set rec_su_delay: Fixed startup delay time for the receiver [hr]
+	 * options: None
+	 * constraints: None
+	 * required if: *
+	 */
+	SAM_EXPORT void SAM_FresnelPhysical_SysControl_rec_su_delay_nset(SAM_table ptr, double number, SAM_error *err);
+
 	/**
 	 * Set weekday_schedule: 12x24 Time of Use Values for week days
 	 * options: None
@@ -1865,10 +1865,6 @@ extern "C"
 
 	SAM_EXPORT double SAM_FresnelPhysical_SolarField_rec_htf_vol_nget(SAM_table ptr, SAM_error *err);
 
-	SAM_EXPORT double SAM_FresnelPhysical_SolarField_rec_qf_delay_nget(SAM_table ptr, SAM_error *err);
-
-	SAM_EXPORT double SAM_FresnelPhysical_SolarField_rec_su_delay_nget(SAM_table ptr, SAM_error *err);
-
 	SAM_EXPORT double SAM_FresnelPhysical_SolarField_theta_dep_nget(SAM_table ptr, SAM_error *err);
 
 	SAM_EXPORT double SAM_FresnelPhysical_SolarField_theta_stow_nget(SAM_table ptr, SAM_error *err);
@@ -2140,6 +2136,10 @@ extern "C"
 
 	SAM_EXPORT double SAM_FresnelPhysical_SysControl_pb_fixed_par_nget(SAM_table ptr, SAM_error *err);
 
+	SAM_EXPORT double SAM_FresnelPhysical_SysControl_rec_qf_delay_nget(SAM_table ptr, SAM_error *err);
+
+	SAM_EXPORT double SAM_FresnelPhysical_SysControl_rec_su_delay_nget(SAM_table ptr, SAM_error *err);
+
 	SAM_EXPORT double* SAM_FresnelPhysical_SysControl_weekday_schedule_mget(SAM_table ptr, int* nrows, int* ncols, SAM_error *err);
 
 	SAM_EXPORT double* SAM_FresnelPhysical_SysControl_weekend_schedule_mget(SAM_table ptr, int* nrows, int* ncols, SAM_error *err);
diff --git a/api/include/SAM_TroughPhysical.h b/api/include/SAM_TroughPhysical.h
@@ -191,6 +191,22 @@ extern "C"
 	 */
 	SAM_EXPORT void SAM_TroughPhysical_SystemControl_rec_op_mode_initial_nset(SAM_table ptr, double number, SAM_error *err);
 
+	/**
+	 * Set rec_qf_delay: Energy-based receiver startup delay (fraction of rated thermal power) [-]
+	 * options: None
+	 * constraints: None
+	 * required if: *
+	 */
+	SAM_EXPORT void SAM_TroughPhysical_SystemControl_rec_qf_delay_nset(SAM_table ptr, double number, SAM_error *err);
+
+	/**
+	 * Set rec_su_delay: Fixed startup delay time for the receiver [hr]
+	 * options: None
+	 * constraints: None
+	 * required if: *
+	 */
+	SAM_EXPORT void SAM_TroughPhysical_SystemControl_rec_su_delay_nset(SAM_table ptr, double number, SAM_error *err);
+
 	/**
 	 * Set sim_type: 1 (default): timeseries, 2: design only
 	 * options: None
@@ -1009,22 +1025,6 @@ extern "C"
 	 */
 	SAM_EXPORT void SAM_TroughPhysical_SolarField_p_start_nset(SAM_table ptr, double number, SAM_error *err);
 
-	/**
-	 * Set rec_qf_delay: Energy-based receiver startup delay (fraction of rated thermal power) [-]
-	 * options: None
-	 * constraints: None
-	 * required if: *
-	 */
-	SAM_EXPORT void SAM_TroughPhysical_SolarField_rec_qf_delay_nset(SAM_table ptr, double number, SAM_error *err);
-
-	/**
-	 * Set rec_su_delay: Fixed startup delay time for the receiver [hr]
-	 * options: None
-	 * constraints: None
-	 * required if: *
-	 */
-	SAM_EXPORT void SAM_TroughPhysical_SolarField_rec_su_delay_nset(SAM_table ptr, double number, SAM_error *err);
-
 	/**
 	 * Set sf_hdr_diams: Custom header diameters [m]
 	 * options: None
@@ -2532,6 +2532,10 @@ extern "C"
 
 	SAM_EXPORT double SAM_TroughPhysical_SystemControl_rec_op_mode_initial_nget(SAM_table ptr, SAM_error *err);
 
+	SAM_EXPORT double SAM_TroughPhysical_SystemControl_rec_qf_delay_nget(SAM_table ptr, SAM_error *err);
+
+	SAM_EXPORT double SAM_TroughPhysical_SystemControl_rec_su_delay_nget(SAM_table ptr, SAM_error *err);
+
 	SAM_EXPORT double SAM_TroughPhysical_SystemControl_sim_type_nget(SAM_table ptr, SAM_error *err);
 
 	SAM_EXPORT double SAM_TroughPhysical_SystemControl_time_start_nget(SAM_table ptr, SAM_error *err);
@@ -2744,10 +2748,6 @@ extern "C"
 
 	SAM_EXPORT double SAM_TroughPhysical_SolarField_p_start_nget(SAM_table ptr, SAM_error *err);
 
-	SAM_EXPORT double SAM_TroughPhysical_SolarField_rec_qf_delay_nget(SAM_table ptr, SAM_error *err);
-
-	SAM_EXPORT double SAM_TroughPhysical_SolarField_rec_su_delay_nget(SAM_table ptr, SAM_error *err);
-
 	SAM_EXPORT double* SAM_TroughPhysical_SolarField_sf_hdr_diams_mget(SAM_table ptr, int* nrows, int* ncols, SAM_error *err);
 
 	SAM_EXPORT double* SAM_TroughPhysical_SolarField_sf_hdr_lengths_mget(SAM_table ptr, int* nrows, int* ncols, SAM_error *err);
diff --git a/api/modules/SAM_FresnelPhysical.cpp b/api/modules/SAM_FresnelPhysical.cpp
diff --git a/api/modules/SAM_TroughPhysical.cpp b/api/modules/SAM_TroughPhysical.cpp
diff --git a/src/codegenerator.cpp b/src/codegenerator.cpp
diff --git a/test_results_win64.csv b/test_results_win64.csv
