Skip to content

Commit d2e8d08

Browse files
tyneisestyneises
authored
Merge pull request #2000 from NREL/patch
Merge patch into develop
2 parents 1d77283 + 56b83b6 commit d2e8d08

File tree

7 files changed

+191
-190
lines changed

7 files changed

+191
-190
lines changed

‎deploy/runtime/cashflow.lk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ function cf_om_expenses()
306306
{
307307
cfline( 'cf_om_fixed2_expense,cf_om_production2_expense,cf_om_capacity2_expense', 0);
308308
cfline( 'cf_fuelcell_replacement_cost', 0);
309+
cfline( 'cf_om_fuel_expense', 0);
309310
}
310311
if ( is_fuel_tech() ) { cfline('cf_om_fuel_expense', 0); }
311312
if ( tech == 'Biopower' ) { cfline( 'cf_om_opt_fuel_1_expense,cf_om_opt_fuel_2_expense', 0); }
@@ -379,7 +380,7 @@ function cf_operating_expenses()
379380
cf_om_expenses();
380381
cfline( 'cf_property_tax_expense', 0);
381382
cfline( 'cf_insurance_expense', 0);
382-
if ( is_land_lease_config() ) { cfline('cf_land_lease_expense', 0); }
383+
if ( is_land_lease_config() && strpos(technology(),'Hybrid') < 0 ) { cfline('cf_land_lease_expense', 0); } // hybrid land lease handled in cf_om_expenses() function
383384
if ( fin == 'Community Solar')
384385
{
385386
cfline('cf_community_solar_recurring_fixed', 0);

‎deploy/runtime/defaults/Physical Trough IPH_Commercial.json‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -17587,7 +17587,7 @@
1758717587
1.0,
1758817588
1.0
1758917589
],
17590-
"COPY_field_thermal_output": 13.3211,
17590+
"COPY_field_thermal_output": 7.92716,
1759117591
"COPY_field_thermal_output_ideal": 14.5179,
1759217592
"COPY_q_pb_design": 5000.0,
1759317593
"COPY_system_capacity_heat_btu": 17.0607,
@@ -17946,8 +17946,8 @@
1794617946
1.0
1794717947
],
1794817948
"FIELD_COPY_I_bn_des": 950.0,
17949-
"FIELD_COPY_T_loop_in_des": 90.0,
17950-
"FIELD_COPY_T_loop_out": 300.0,
17949+
"FIELD_COPY_T_loop_in_des": 293.0,
17950+
"FIELD_COPY_T_loop_out": 391.0,
1795117951
"FIELD_COPY_nLoops": 4.0,
1795217952
"FIELD_COPY_solar_mult": 2.90358,
1795317953
"FieldConfig": 1.0,
@@ -18403,16 +18403,16 @@
1840318403
]
1840418404
],
1840518405
"SolarAz": 0.0,
18406-
"TES_COPY_T_loop_in_des": 90.0,
18407-
"TES_COPY_T_loop_out": 300.0,
18406+
"TES_COPY_T_loop_in_des": 293.0,
18407+
"TES_COPY_T_loop_out": 391.0,
1840818408
"TES_COPY_q_pb_design": 5.0,
1840918409
"TES_COPY_tshours": 6.0,
1841018410
"TES_DISP_tes_type": 0.0,
18411-
"T_fp": 10.0,
18412-
"T_loop_in_des": 90.0,
18413-
"T_loop_out": 300.0,
18414-
"T_shutdown": 159.3,
18415-
"T_startup": 159.3,
18411+
"T_fp": 150.0,
18412+
"T_loop_in_des": 293.0,
18413+
"T_loop_out": 391.0,
18414+
"T_shutdown": 325.34,
18415+
"T_startup": 325.34,
1841618416
"T_tank_cold_ini": 300.0,
1841718417
"T_tank_hot_inlet_min": 400.0,
1841818418
"Tau_envelope": [
@@ -18544,15 +18544,15 @@
1854418544
"V_hdr_cold_min": 2.0,
1854518545
"V_hdr_hot_max": 3.0,
1854618546
"V_hdr_hot_min": 2.0,
18547-
"V_tank_hot_ini": 59.7727,
18547+
"V_tank_hot_ini": 145.32,
1854818548
"V_tes_des": 1.85,
1854918549
"W_aperture": [
1855018550
8.2,
1855118551
6.0,
1855218552
6.0,
1855318553
6.0
1855418554
],
18555-
"W_dot_pump_SS": 0.0224465,
18555+
"W_dot_pump_SS": 0.0748562,
1855618556
"accept_init": 0.0,
1855718557
"accept_loc": 1.0,
1855818558
"accept_mode": 0.0,
@@ -18698,7 +18698,7 @@
1869818698
"cbi_uti_tax_sta": 1.0,
1869918699
"chk_update_peaks": 0.0,
1870018700
"city": "-",
18701-
"cold_tank_Thtr": 60.0,
18701+
"cold_tank_Thtr": 250.0,
1870218702
"cold_tank_max_heat": 0.5,
1870318703
"collector_library": "SunBeam IPH",
1870418704
"collectors_in_field": "Cold - 1 - 1 - 1 - 1 - Hot",
@@ -18722,51 +18722,51 @@
1872218722
"csp.dtr.cost.bop": 450000.0,
1872318723
"csp.dtr.cost.bop_mwe": 5.0,
1872418724
"csp.dtr.cost.bop_per_kwe": 90.0,
18725-
"csp.dtr.cost.contingency": 755143.0,
18725+
"csp.dtr.cost.contingency": 771943.0,
1872618726
"csp.dtr.cost.contingency_percent": 7.0,
1872718727
"csp.dtr.cost.epc.cost_per_watt": 0.0,
1872818728
"csp.dtr.cost.epc.fixed": 0.0,
1872918729
"csp.dtr.cost.epc.per_acre": 0.0,
1873018730
"csp.dtr.cost.epc.per_watt": 0.0,
1873118731
"csp.dtr.cost.epc.percent": 11.0,
18732-
"csp.dtr.cost.epc.total": 1269720.0,
18732+
"csp.dtr.cost.epc.total": 1297970.0,
1873318733
"csp.dtr.cost.heat_sink": 600000.0,
1873418734
"csp.dtr.cost.heat_sink.cost_per_kwe": 120.0,
1873518735
"csp.dtr.cost.heat_sink.mwe": 5.0,
1873618736
"csp.dtr.cost.htf_system": 1267200.0,
1873718737
"csp.dtr.cost.htf_system.area": 21120.0,
1873818738
"csp.dtr.cost.htf_system.cost_per_m2": 60.0,
18739-
"csp.dtr.cost.installed_per_capacity": 2675.87,
18739+
"csp.dtr.cost.installed_per_capacity": 2734.93,
1874018740
"csp.dtr.cost.nameplate": 5.0,
1874118741
"csp.dtr.cost.plm.fixed": 0.0,
1874218742
"csp.dtr.cost.plm.per_acre": 10000.0,
1874318743
"csp.dtr.cost.plm.per_watt": 0.0,
1874418744
"csp.dtr.cost.plm.percent": 0.0,
1874518745
"csp.dtr.cost.plm.total": 105011.0,
1874618746
"csp.dtr.cost.sales_tax.percent": 80.0,
18747-
"csp.dtr.cost.sales_tax.total": 461716.0,
18747+
"csp.dtr.cost.sales_tax.total": 471988.0,
1874818748
"csp.dtr.cost.sales_tax.value": 5.0,
1874918749
"csp.dtr.cost.site_improvements": 337920.0,
1875018750
"csp.dtr.cost.site_improvements.area": 21120.0,
1875118751
"csp.dtr.cost.site_improvements.cost_per_m2": 16.0,
1875218752
"csp.dtr.cost.solar_field": 6272640.0,
1875318753
"csp.dtr.cost.solar_field.area": 21120.0,
1875418754
"csp.dtr.cost.solar_field.cost_per_m2": 297.0,
18755-
"csp.dtr.cost.storage": 1860000.0,
18756-
"csp.dtr.cost.storage.cost_per_kwht": 62.0,
18755+
"csp.dtr.cost.storage": 2100000.0,
18756+
"csp.dtr.cost.storage.cost_per_kwht": 70.0,
1875718757
"csp.dtr.cost.storage.mwht": 30.0,
1875818758
"csp.dtr.cost.total_land_area": 10.5011,
1875918759
"csp.dtr.tes.fluid_sph": 0.0,
18760-
"csp.dtr.tes.htf_calc_temp": 195.0,
18760+
"csp.dtr.tes.htf_calc_temp": 342.0,
1876118761
"csp.dtr.tes.htf_max_opt_temp": 593.0,
1876218762
"csp.dtr.tes.htf_min_opt_temp": 238.0,
18763-
"csp.dtr.tes.min_fluid_volume": 6.41463,
18763+
"csp.dtr.tes.min_fluid_volume": 39.6744,
1876418764
"csp.dtr.tes.thermal_capacity": 30.0,
1876518765
"csp.pt.par.calc.aux": 0.12121,
1876618766
"csp.pt.par.calc.bop": 0.0,
18767-
"csp.pt.tes.htf_density": 1965.98,
18768-
"csp.pt.tes.tank_diameter": 4.04162,
18769-
"csp.pt.tes.tank_height": 15.0,
18767+
"csp.pt.tes.htf_density": 1872.49,
18768+
"csp.pt.tes.tank_diameter": 7.10739,
18769+
"csp.pt.tes.tank_height": 12.0,
1877018770
"csp_dtr_hce_absorber_material_1": 0.0,
1877118771
"csp_dtr_hce_absorber_material_2": 0.0,
1877218772
"csp_dtr_hce_absorber_material_3": 0.0,
@@ -19130,7 +19130,7 @@
1913019130
"custom_sf_pipe_sizes": 0.0,
1913119131
"custom_tes_p_loss": 0.0,
1913219132
"custom_tes_pipe_sizes": 0.0,
19133-
"dP_sf_SS": 5.03184,
19133+
"dP_sf_SS": 10.1475,
1913419134
"d_tank_in": 0.0,
1913519135
"debt_fraction": 60.0,
1913619136
"debt_message": "",
@@ -19147,7 +19147,7 @@
1914719147
],
1914819148
"depr_sta_sl_years": 7.0,
1914919149
"depr_sta_type": 1.0,
19150-
"direct_subtotal": 10787800.0,
19150+
"direct_subtotal": 11027800.0,
1915119151
"disp_frequency": 24.0,
1915219152
"disp_horizon": 48.0,
1915319153
"disp_max_iter": 50000.0,
@@ -19395,9 +19395,9 @@
1939519395
],
1939619396
"eta_pump": 0.85,
1939719397
"f_htfmax": 1.2,
19398-
"f_htfmax_actual": 0.917563,
19398+
"f_htfmax_actual": 0.546026,
1939919399
"f_htfmin": 0.25,
19400-
"f_htfmin_actual": 0.0764636,
19400+
"f_htfmin_actual": 0.0455022,
1940119401
"f_tc_cold": 2.0,
1940219402
"federal_tax_rate": [
1940319403
21.0
@@ -19503,24 +19503,24 @@
1950319503
941.0
1950419504
]
1950519505
],
19506-
"field_htf_cp_avg": 2.85038,
19506+
"field_htf_cp_avg": 3.3429,
1950719507
"field_htf_max_operating_temp": 400.0,
1950819508
"field_htf_min_operating_temp": 12.0,
19509-
"field_thermal_output": 13.3211,
19509+
"field_thermal_output": 7.92716,
1951019510
"field_thermal_output_ideal": 14.5179,
1951119511
"file_name": "tucson_az_32.116521_-110.933042_psmv3_60_tmy.csv",
1951219512
"fixed_land_area": 9.5465,
1951319513
"fluid_dens_inlet_temp": 965.937,
1951419514
"fluid_dens_outlet_temp": 918.795,
1951519515
"fthrctrl": 2.0,
1951619516
"fthrok": 1.0,
19517-
"h_tank_in": 15.0,
19518-
"h_tank_min": 0.5,
19517+
"h_tank_in": 12.0,
19518+
"h_tank_min": 1.0,
1951919519
"has_hot_tank_bypass": 0.0,
1952019520
"hce_2_is_shown": 1.0,
1952119521
"hce_3_is_shown": 1.0,
1952219522
"hce_4_is_shown": 1.0,
19523-
"hot_tank_Thtr": 110.0,
19523+
"hot_tank_Thtr": 365.0,
1952419524
"hot_tank_max_heat": 1.0,
1952519525
"hs_phys_N_sub": 100.0,
1952619526
"hs_phys_P_steam_hot_des": 4.762,
@@ -37275,11 +37275,11 @@
3727537275
"m_dot_htfmin": 1.0,
3727637276
"m_dot_htfmin_actual": 1.0,
3727737277
"max_collector_width": 6.0,
37278-
"max_field_flow_velocity": 5.82531,
37278+
"max_field_flow_velocity": 6.61309,
3727937279
"mc_bal_cold": 0.2,
3728037280
"mc_bal_hot": 0.2,
3728137281
"mc_bal_sca": 4.5,
37282-
"min_field_flow_velocity": 0.297718,
37282+
"min_field_flow_velocity": 0.474321,
3728337283
"min_inner_diameter": 0.076,
3728437284
"mpeak": [
3728537285
5000.0,
@@ -37369,7 +37369,7 @@
3736937369
"peak_9": 5000.0,
3737037370
"prop_tax_assessed_decline": 0.0,
3737137371
"prop_tax_cost_assessed_percent": 100.0,
37372-
"property_assessed_value": 13379400.0,
37372+
"property_assessed_value": 13674700.0,
3737337373
"property_tax_rate": 0.0,
3737437374
"ptc_fed_amount_heat_btu": [
3737537375
0.0
@@ -37381,7 +37381,7 @@
3738137381
],
3738237382
"ptc_sta_escal": 0.0,
3738337383
"ptc_sta_term": 10.0,
37384-
"q_dot_tes_est": 0.0219549,
37384+
"q_dot_tes_est": 0.0804725,
3738537385
"q_pb_design": 5.0,
3738637386
"rate_escalation": [
3738737387
0.0
@@ -37466,7 +37466,7 @@
3746637466
"tanks_in_parallel": 1.0,
3746737467
"tc_fill": 7.0,
3746837468
"tc_void": 0.25,
37469-
"tes_avail_vol": 186.024,
37469+
"tes_avail_vol": 436.418,
3747037470
"tes_cyl_piston_loss_poly": [
3747137471
0.0,
3747237472
0.0,
@@ -37487,7 +37487,7 @@
3748737487
]
3748837488
],
3748937489
"tes_n_tsteps": 100.0,
37490-
"tes_pb_T_charge_min": 290.0,
37490+
"tes_pb_T_charge_min": 381.0,
3749137491
"tes_pb_T_cold_delta": 30.0,
3749237492
"tes_pb_T_hot_delta": 30.0,
3749337493
"tes_pb_cp_solid": 0.83,
@@ -37503,7 +37503,7 @@
3750337503
-1.0
3750437504
]
3750537505
],
37506-
"thermal_buy_rate_flat_heat_btu": 14.0,
37506+
"thermal_buy_rate_flat_heat_btu": 14.5,
3750737507
"thermal_buy_rate_option": 0.0,
3750837508
"thermal_conversion_efficiency": 85.0,
3750937509
"thermal_monthly_buy_rate_heat_btu": [
@@ -46298,9 +46298,9 @@
4629846298
1.0
4629946299
],
4630046300
"total_aperture": 21120.0,
46301-
"total_direct_cost": 11542900.0,
46302-
"total_indirect_cost": 1374730.0,
46303-
"total_installed_cost": 13379400.0,
46301+
"total_direct_cost": 11799700.0,
46302+
"total_indirect_cost": 1402980.0,
46303+
"total_installed_cost": 13674700.0,
4630446304
"total_land_area": 10.5011,
4630546305
"total_loop_conversion_efficiency": 0.72358,
4630646306
"total_required_aperture_for_SM1": 7273.77,
@@ -46324,7 +46324,7 @@
4632446324
"tshours": 6.0,
4632546325
"tshours_sf": 2.24118,
4632646326
"tz": -7.0,
46327-
"u_tank": 0.3,
46327+
"u_tank": 0.4,
4632846328
"ui_A_aperture": 1320.0,
4632946329
"ui_AbsorberMaterial": 0.0,
4633046330
"ui_AnnulusGas_1": 2.0,
@@ -46428,8 +46428,8 @@
4642846428
"ui_epsilon_4_1": 0.86,
4642946429
"ui_epsilon_4_2": 0.86,
4643046430
"ui_epsilon_4_3": 1.0,
46431-
"ui_loan_amount": 8027610.0,
46432-
"ui_net_capital_cost": 13379400.0,
46431+
"ui_loan_amount": 8204800.0,
46432+
"ui_net_capital_cost": 13674700.0,
4643346433
"ui_receiver_description": "Schott PTR70 2008",
4643446434
"ui_step_minutes": 60.0,
4643546435
"ui_wacc": 6.70974,
@@ -65500,7 +65500,7 @@
6550065500
300.0,
6550165501
300.0
6550265502
],
65503-
"vol_tank": 192.439,
65503+
"vol_tank": 476.093,
6550465504
"washing_frequency": 12.0,
6550565505
"water_usage_per_wash": 0.7,
6550665506
"wf_nrecords": 8760.0,

0 commit comments

Comments
 (0)