Merge branch 'patch' into ortool__full_release

Author: sjanzou

api/include/SAM_FresnelPhysical.h

@@ -2655,6 +2655,8 @@ extern "C"
 
 	SAM_EXPORT double* SAM_FresnelPhysical_Outputs_rec_thermal_eff_aget(SAM_table ptr, int* length, SAM_error *err);
 
+	SAM_EXPORT double* SAM_FresnelPhysical_Outputs_rec_time_in_startup_aget(SAM_table ptr, int* length, SAM_error *err);
+
 	SAM_EXPORT double* SAM_FresnelPhysical_Outputs_recirculating_aget(SAM_table ptr, int* length, SAM_error *err);
 
 	SAM_EXPORT double* SAM_FresnelPhysical_Outputs_rh_aget(SAM_table ptr, int* length, SAM_error *err);

api/include/SAM_FresnelPhysicalIph.h

@@ -2713,6 +2713,8 @@ extern "C"
 
 	SAM_EXPORT double* SAM_FresnelPhysicalIph_Outputs_rec_thermal_eff_aget(SAM_table ptr, int* length, SAM_error *err);
 
+	SAM_EXPORT double* SAM_FresnelPhysicalIph_Outputs_rec_time_in_startup_aget(SAM_table ptr, int* length, SAM_error *err);
+
 	SAM_EXPORT double* SAM_FresnelPhysicalIph_Outputs_recirculating_aget(SAM_table ptr, int* length, SAM_error *err);
 
 	SAM_EXPORT double* SAM_FresnelPhysicalIph_Outputs_rh_aget(SAM_table ptr, int* length, SAM_error *err);

api/include/SAM_TroughPhysical.h

@@ -3655,6 +3655,8 @@ extern "C"
 
 	SAM_EXPORT double* SAM_TroughPhysical_Outputs_rec_op_mode_final_aget(SAM_table ptr, int* length, SAM_error *err);
 
+	SAM_EXPORT double* SAM_TroughPhysical_Outputs_rec_time_in_startup_aget(SAM_table ptr, int* length, SAM_error *err);
+
 	SAM_EXPORT double* SAM_TroughPhysical_Outputs_recirculating_aget(SAM_table ptr, int* length, SAM_error *err);
 
 	SAM_EXPORT double SAM_TroughPhysical_Outputs_required_number_of_loops_for_SM1_nget(SAM_table ptr, SAM_error *err);

api/include/SAM_TroughPhysicalIph.h

@@ -3519,6 +3519,8 @@ extern "C"
 
 	SAM_EXPORT double* SAM_TroughPhysicalIph_Outputs_qinc_costh_aget(SAM_table ptr, int* length, SAM_error *err);
 
+	SAM_EXPORT double* SAM_TroughPhysicalIph_Outputs_rec_time_in_startup_aget(SAM_table ptr, int* length, SAM_error *err);
+
 	SAM_EXPORT double* SAM_TroughPhysicalIph_Outputs_recirculating_aget(SAM_table ptr, int* length, SAM_error *err);
 
 	SAM_EXPORT double SAM_TroughPhysicalIph_Outputs_required_number_of_loops_for_SM1_nget(SAM_table ptr, SAM_error *err);

api/modules/SAM_FresnelPhysical.cpp

@@ -4953,6 +4953,16 @@ SAM_EXPORT double* SAM_FresnelPhysical_Outputs_rec_thermal_eff_aget(SAM_table pt
 	return result;
 }
 
+SAM_EXPORT double* SAM_FresnelPhysical_Outputs_rec_time_in_startup_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "rec_time_in_startup", length);
+	if (!result)
+		make_access_error("SAM_FresnelPhysical", "rec_time_in_startup");
+	});
+	return result;
+}
+
 SAM_EXPORT double* SAM_FresnelPhysical_Outputs_recirculating_aget(SAM_table ptr, int* length, SAM_error *err){
 	double* result = nullptr;
 	translateExceptions(err, [&]{

api/modules/SAM_FresnelPhysicalIph.cpp

@@ -5077,6 +5077,16 @@ SAM_EXPORT double* SAM_FresnelPhysicalIph_Outputs_rec_thermal_eff_aget(SAM_table
 	return result;
 }
 
+SAM_EXPORT double* SAM_FresnelPhysicalIph_Outputs_rec_time_in_startup_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "rec_time_in_startup", length);
+	if (!result)
+		make_access_error("SAM_FresnelPhysicalIph", "rec_time_in_startup");
+	});
+	return result;
+}
+
 SAM_EXPORT double* SAM_FresnelPhysicalIph_Outputs_recirculating_aget(SAM_table ptr, int* length, SAM_error *err){
 	double* result = nullptr;
 	translateExceptions(err, [&]{

api/modules/SAM_TroughPhysical.cpp

@@ -6898,6 +6898,16 @@ SAM_EXPORT double* SAM_TroughPhysical_Outputs_rec_op_mode_final_aget(SAM_table p
 	return result;
 }
 
+SAM_EXPORT double* SAM_TroughPhysical_Outputs_rec_time_in_startup_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "rec_time_in_startup", length);
+	if (!result)
+		make_access_error("SAM_TroughPhysical", "rec_time_in_startup");
+	});
+	return result;
+}
+
 SAM_EXPORT double* SAM_TroughPhysical_Outputs_recirculating_aget(SAM_table ptr, int* length, SAM_error *err){
 	double* result = nullptr;
 	translateExceptions(err, [&]{

api/modules/SAM_TroughPhysicalIph.cpp

@@ -6630,6 +6630,16 @@ SAM_EXPORT double* SAM_TroughPhysicalIph_Outputs_qinc_costh_aget(SAM_table ptr,
 	return result;
 }
 
+SAM_EXPORT double* SAM_TroughPhysicalIph_Outputs_rec_time_in_startup_aget(SAM_table ptr, int* length, SAM_error *err){
+	double* result = nullptr;
+	translateExceptions(err, [&]{
+	result = ssc_data_get_array(ptr, "rec_time_in_startup", length);
+	if (!result)
+		make_access_error("SAM_TroughPhysicalIph", "rec_time_in_startup");
+	});
+	return result;
+}
+
 SAM_EXPORT double* SAM_TroughPhysicalIph_Outputs_recirculating_aget(SAM_table ptr, int* length, SAM_error *err){
 	double* result = nullptr;
 	translateExceptions(err, [&]{

deploy/runtime/macros/Flat Plate PV/Append Snow Data.lk

@@ -128,7 +128,7 @@ if( mod(weatherLength, 8760) != 0){
 // Load snow data
 
 if( sf_unit == 'cm' ) conversion = 1.0;
-if( sf_unit == 'inch' ) conversion = 2.54;
+if( sf_unit == 'in' ) conversion = 2.54;
 if( sf_unit == 'mm' ) conversion = 0.1;
 if( sf_unit == 'feet' ) conversion = 30.48;
 if( sf_unit == 'meters' ) conversion = 100.0;

deploy/runtime/macros/PV Battery/Append Snow Data.lk

@@ -128,7 +128,7 @@ if( mod(weatherLength, 8760) != 0){
 // Load snow data
 
 if( sf_unit == 'cm' ) conversion = 1.0;
-if( sf_unit == 'inch' ) conversion = 2.54;
+if( sf_unit == 'in' ) conversion = 2.54;
 if( sf_unit == 'mm' ) conversion = 0.1;
 if( sf_unit == 'feet' ) conversion = 30.48;
 if( sf_unit == 'meters' ) conversion = 100.0;