Skip to content

Commit

Permalink
Merge pull request #1445 from NREL/ssc_1047
Browse files Browse the repository at this point in the history 
Goes with ssc pull request 1048
  • Loading branch information
@brtietz
brtietz authored Sep 15, 2023
2 parents 8fccdb4 + 8a00680 commit 986776a
Show file tree
Hide file tree
Showing 20 changed files with 2,656 additions and 1,169 deletions.
1 change: 1 addition & 0 deletions api/api_autogen/library/defaults/EtesElectricResistance_ETESSingleOwner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@
[580.000000, 1.000000, 52.105300, 1.003930, 1.021130, 1.000000, 1.000000],
[580.000000, 1.000000, 55.000000, 0.996738, 1.021130, 1.000000, 1.000000]
],
"ud_is_sco2_regr": 0,
"ud_m_dot_water_cool_des": 0
},
"ThermalStorage": {
Expand Down
97 changes: 49 additions & 48 deletions api/api_autogen/library/defaults/TcsmoltenSalt_MSPTAllEquityPartnershipFlip.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,54 @@
"solarm": 2.4,
"tshours": 10
},
"TowerAndReceiver": {
"D_rec": 16.922,
"Flow_type": 1,
"N_panels": 20,
"cav_rec_height": 10,
"cav_rec_passive_abs": 0.3,
"cav_rec_passive_eps": 0.5,
"cav_rec_span": 180,
"cav_rec_width": 10,
"csp_pt_rec_max_oper_frac": 1.2,
"d_tube_out": 40,
"delta_flux_hrs": 2,
"downc_tm_mult": 1,
"epsilon": 0.88,
"eta_pump": 0.85,
"f_rec_min": 0.25,
"field_fl_props": [
[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
],
"flux_max": 1000,
"h_tower": 194.227,
"heat_trace_power": 500,
"hl_ffact": 1,
"is_rec_enforce_min_startup": 0,
"is_rec_model_trans": 0,
"is_rec_startup_from_T_soln": 0,
"is_rec_startup_trans": 0,
"mat_tube": 2,
"n_cav_rec_panels": 6,
"n_flux_days": 8,
"piping_length_const": 0,
"piping_length_mult": 2.6,
"piping_loss_coefficient": 2,
"preheat_flux": 50,
"rec_absorptance": 0.94,
"rec_height": 20.4598,
"rec_hl_perm2": 30,
"rec_htf": 17,
"rec_qf_delay": 0.25,
"rec_su_delay": 0.5,
"rec_tm_mult": 1,
"riser_tm_mult": 1,
"startup_ramp_time": 0,
"startup_target_Tdiff": -5,
"th_riser": 15,
"th_tube": 1.25,
"u_riser": 4
},
"HeliostatField": {
"c_atm_0": 0.006789,
"c_atm_1": 0.1046,
Expand Down Expand Up @@ -9453,54 +9501,6 @@
"washing_frequency": 63,
"water_usage_per_wash": 0.7
},
"TowerAndReceiver": {
"D_rec": 16.922,
"Flow_type": 1,
"N_panels": 20,
"cav_rec_height": 10,
"cav_rec_passive_abs": 0.3,
"cav_rec_passive_eps": 0.5,
"cav_rec_span": 180,
"cav_rec_width": 10,
"csp_pt_rec_max_oper_frac": 1.2,
"d_tube_out": 40,
"delta_flux_hrs": 2,
"downc_tm_mult": 1,
"epsilon": 0.88,
"eta_pump": 0.85,
"f_rec_min": 0.25,
"field_fl_props": [
[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
],
"flux_max": 1000,
"h_tower": 194.227,
"heat_trace_power": 500,
"hl_ffact": 1,
"is_rec_enforce_min_startup": 0,
"is_rec_model_trans": 0,
"is_rec_startup_from_T_soln": 0,
"is_rec_startup_trans": 0,
"mat_tube": 2,
"n_cav_rec_panels": 6,
"n_flux_days": 8,
"piping_length_const": 0,
"piping_length_mult": 2.6,
"piping_loss_coefficient": 2,
"preheat_flux": 50,
"rec_absorptance": 0.94,
"rec_height": 20.4598,
"rec_hl_perm2": 30,
"rec_htf": 17,
"rec_qf_delay": 0.25,
"rec_su_delay": 0.5,
"rec_tm_mult": 1,
"riser_tm_mult": 1,
"startup_ramp_time": 0,
"startup_target_Tdiff": -5,
"th_riser": 15,
"th_tube": 1.25,
"u_riser": 4
},
"ParallelHeater": {
"f_q_dot_des_allowable_su": 1,
"f_q_dot_heater_min": 0.25,
Expand Down Expand Up @@ -9783,6 +9783,7 @@
[580.000000, 1.000000, 52.105300, 1.003930, 1.021130, 1.000000, 1.000000],
[580.000000, 1.000000, 55.000000, 0.996738, 1.021130, 1.000000, 1.000000]
],
"ud_is_sco2_regr": 0,
"ud_m_dot_water_cool_des": 0
},
"TimeOfDeliveryFactors": {
Expand Down
97 changes: 49 additions & 48 deletions api/api_autogen/library/defaults/TcsmoltenSalt_MSPTLeveragedPartnershipFlip.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,54 @@
"solarm": 2.4,
"tshours": 10
},
"TowerAndReceiver": {
"D_rec": 16.922,
"Flow_type": 1,
"N_panels": 20,
"cav_rec_height": 10,
"cav_rec_passive_abs": 0.3,
"cav_rec_passive_eps": 0.5,
"cav_rec_span": 180,
"cav_rec_width": 10,
"csp_pt_rec_max_oper_frac": 1.2,
"d_tube_out": 40,
"delta_flux_hrs": 2,
"downc_tm_mult": 1,
"epsilon": 0.88,
"eta_pump": 0.85,
"f_rec_min": 0.25,
"field_fl_props": [
[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
],
"flux_max": 1000,
"h_tower": 194.227,
"heat_trace_power": 500,
"hl_ffact": 1,
"is_rec_enforce_min_startup": 0,
"is_rec_model_trans": 0,
"is_rec_startup_from_T_soln": 0,
"is_rec_startup_trans": 0,
"mat_tube": 2,
"n_cav_rec_panels": 6,
"n_flux_days": 8,
"piping_length_const": 0,
"piping_length_mult": 2.6,
"piping_loss_coefficient": 2,
"preheat_flux": 50,
"rec_absorptance": 0.94,
"rec_height": 20.4598,
"rec_hl_perm2": 30,
"rec_htf": 17,
"rec_qf_delay": 0.25,
"rec_su_delay": 0.5,
"rec_tm_mult": 1,
"riser_tm_mult": 1,
"startup_ramp_time": 0,
"startup_target_Tdiff": -5,
"th_riser": 15,
"th_tube": 1.25,
"u_riser": 4
},
"HeliostatField": {
"c_atm_0": 0.006789,
"c_atm_1": 0.1046,
Expand Down Expand Up @@ -9453,54 +9501,6 @@
"washing_frequency": 63,
"water_usage_per_wash": 0.7
},
"TowerAndReceiver": {
"D_rec": 16.922,
"Flow_type": 1,
"N_panels": 20,
"cav_rec_height": 10,
"cav_rec_passive_abs": 0.3,
"cav_rec_passive_eps": 0.5,
"cav_rec_span": 180,
"cav_rec_width": 10,
"csp_pt_rec_max_oper_frac": 1.2,
"d_tube_out": 40,
"delta_flux_hrs": 2,
"downc_tm_mult": 1,
"epsilon": 0.88,
"eta_pump": 0.85,
"f_rec_min": 0.25,
"field_fl_props": [
[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
],
"flux_max": 1000,
"h_tower": 194.227,
"heat_trace_power": 500,
"hl_ffact": 1,
"is_rec_enforce_min_startup": 0,
"is_rec_model_trans": 0,
"is_rec_startup_from_T_soln": 0,
"is_rec_startup_trans": 0,
"mat_tube": 2,
"n_cav_rec_panels": 6,
"n_flux_days": 8,
"piping_length_const": 0,
"piping_length_mult": 2.6,
"piping_loss_coefficient": 2,
"preheat_flux": 50,
"rec_absorptance": 0.94,
"rec_height": 20.4598,
"rec_hl_perm2": 30,
"rec_htf": 17,
"rec_qf_delay": 0.25,
"rec_su_delay": 0.5,
"rec_tm_mult": 1,
"riser_tm_mult": 1,
"startup_ramp_time": 0,
"startup_target_Tdiff": -5,
"th_riser": 15,
"th_tube": 1.25,
"u_riser": 4
},
"ParallelHeater": {
"f_q_dot_des_allowable_su": 1,
"f_q_dot_heater_min": 0.25,
Expand Down Expand Up @@ -9783,6 +9783,7 @@
[580.000000, 1.000000, 52.105300, 1.003930, 1.021130, 1.000000, 1.000000],
[580.000000, 1.000000, 55.000000, 0.996738, 1.021130, 1.000000, 1.000000]
],
"ud_is_sco2_regr": 0,
"ud_m_dot_water_cool_des": 0
},
"TimeOfDeliveryFactors": {
Expand Down
97 changes: 49 additions & 48 deletions api/api_autogen/library/defaults/TcsmoltenSalt_MSPTMerchantPlant.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,54 @@
"solarm": 2.4,
"tshours": 10
},
"TowerAndReceiver": {
"D_rec": 16.922,
"Flow_type": 1,
"N_panels": 20,
"cav_rec_height": 10,
"cav_rec_passive_abs": 0.3,
"cav_rec_passive_eps": 0.5,
"cav_rec_span": 180,
"cav_rec_width": 10,
"csp_pt_rec_max_oper_frac": 1.2,
"d_tube_out": 40,
"delta_flux_hrs": 2,
"downc_tm_mult": 1,
"epsilon": 0.88,
"eta_pump": 0.85,
"f_rec_min": 0.25,
"field_fl_props": [
[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
],
"flux_max": 1000,
"h_tower": 194.227,
"heat_trace_power": 500,
"hl_ffact": 1,
"is_rec_enforce_min_startup": 0,
"is_rec_model_trans": 0,
"is_rec_startup_from_T_soln": 0,
"is_rec_startup_trans": 0,
"mat_tube": 2,
"n_cav_rec_panels": 6,
"n_flux_days": 8,
"piping_length_const": 0,
"piping_length_mult": 2.6,
"piping_loss_coefficient": 2,
"preheat_flux": 50,
"rec_absorptance": 0.94,
"rec_height": 20.4598,
"rec_hl_perm2": 30,
"rec_htf": 17,
"rec_qf_delay": 0.25,
"rec_su_delay": 0.5,
"rec_tm_mult": 1,
"riser_tm_mult": 1,
"startup_ramp_time": 0,
"startup_target_Tdiff": -5,
"th_riser": 15,
"th_tube": 1.25,
"u_riser": 4
},
"HeliostatField": {
"c_atm_0": 0.006789,
"c_atm_1": 0.1046,
Expand Down Expand Up @@ -9453,54 +9501,6 @@
"washing_frequency": 63,
"water_usage_per_wash": 0.7
},
"TowerAndReceiver": {
"D_rec": 16.922,
"Flow_type": 1,
"N_panels": 20,
"cav_rec_height": 10,
"cav_rec_passive_abs": 0.3,
"cav_rec_passive_eps": 0.5,
"cav_rec_span": 180,
"cav_rec_width": 10,
"csp_pt_rec_max_oper_frac": 1.2,
"d_tube_out": 40,
"delta_flux_hrs": 2,
"downc_tm_mult": 1,
"epsilon": 0.88,
"eta_pump": 0.85,
"f_rec_min": 0.25,
"field_fl_props": [
[0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000]
],
"flux_max": 1000,
"h_tower": 194.227,
"heat_trace_power": 500,
"hl_ffact": 1,
"is_rec_enforce_min_startup": 0,
"is_rec_model_trans": 0,
"is_rec_startup_from_T_soln": 0,
"is_rec_startup_trans": 0,
"mat_tube": 2,
"n_cav_rec_panels": 6,
"n_flux_days": 8,
"piping_length_const": 0,
"piping_length_mult": 2.6,
"piping_loss_coefficient": 2,
"preheat_flux": 50,
"rec_absorptance": 0.94,
"rec_height": 20.4598,
"rec_hl_perm2": 30,
"rec_htf": 17,
"rec_qf_delay": 0.25,
"rec_su_delay": 0.5,
"rec_tm_mult": 1,
"riser_tm_mult": 1,
"startup_ramp_time": 0,
"startup_target_Tdiff": -5,
"th_riser": 15,
"th_tube": 1.25,
"u_riser": 4
},
"ParallelHeater": {
"f_q_dot_des_allowable_su": 1,
"f_q_dot_heater_min": 0.25,
Expand Down Expand Up @@ -9783,6 +9783,7 @@
[580.000000, 1.000000, 52.105300, 1.003930, 1.021130, 1.000000, 1.000000],
[580.000000, 1.000000, 55.000000, 0.996738, 1.021130, 1.000000, 1.000000]
],
"ud_is_sco2_regr": 0,
"ud_m_dot_water_cool_des": 0
},
"TimeOfDeliveryFactors": {
Expand Down
Loading

0 comments on commit 986776a

Please sign in to comment.