Skip to content

Commit

Permalink
Merge branch 'patch' into getem_costs
Browse files Browse the repository at this point in the history
  • Loading branch information
@sjanzou
sjanzou committed Feb 5, 2025
2 parents faf6add + 994cff4 commit 7deb0e1
Show file tree
Hide file tree
Showing 21 changed files with 515 additions and 473 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
DEFAULT_BRANCH: develop
DEFAULT_BRANCH: patch
WX_VERSION: '3.2.6'

jobs:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ The stepwise and LHS [LGPL](https://www.gnu.org/licenses/lgpl-3.0.en.html) licen

# Citing this package

System Advisor Model Version 2023.12.17 (2023). SAM source code. National Renewable Energy Laboratory. Golden, CO. Accessed December 18, 2023. https://github.com/NREL/SAM
System Advisor Model Version 2024.12.12 (2024). SAM source code. National Renewable Energy Laboratory. Golden, CO. Accessed December 13, 2024. https://github.com/NREL/SAM
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/CashloanHeat_PhysicalTroughIPHCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"om_fixed_escal": 0,
"om_production_escal": 0,
"om_production_heat": [2.000000],
"total_installed_cost": 1.33794e+07
"total_installed_cost": 1.36747e+07
},
"LandLease": {
},
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/LcoefcrDesign_PhysicalTroughIPHLCOHCalculator.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"variable_operating_cost": 0.002
},
"SystemCosts": {
"total_installed_cost": 1.33794e+07
"total_installed_cost": 1.36747e+07
},
"IPHLCOH": {
"electricity_rate": 0.06
Expand Down
4 changes: 2 additions & 2 deletions api/api_autogen/library/defaults/SingleownerHeat_PhysicalTroughIPHSingleOwner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"FinancialParameters": {
"analysis_period": 25,
"construction_financing_cost": 1.00345e+06,
"construction_financing_cost": 1.0256e+06,
"cost_debt_closing": 0,
"cost_debt_fee": 2.75,
"cost_other_financing": 0,
Expand Down Expand Up @@ -51,7 +51,7 @@
"om_fixed_escal": 0,
"om_production_escal": 0,
"om_production_heat": [2.000000],
"total_installed_cost": 1.33794e+07
"total_installed_cost": 1.36747e+07
},
"LandLease": {
},
Expand Down
2 changes: 1 addition & 1 deletion api/api_autogen/library/defaults/ThermalrateIph_PhysicalTroughIPHCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"defaults": {
"ThermalRate": {
"gen_heat": [0],
"thermal_buy_rate_flat_heat_btu": 14,
"thermal_buy_rate_flat_heat_btu": 14.5,
"thermal_buy_rate_option": 0,
"thermal_conversion_efficiency": 85,
"thermal_monthly_buy_rate_heat_btu": [0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000],
Expand Down
24 changes: 12 additions & 12 deletions api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHCommercial.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@
[0.935000, 0.935000, 0.935000, 0.963000],
[0.935000, 0.935000, 0.935000, 0.963000]
],
"T_fp": 10,
"T_loop_in_des": 90,
"T_loop_out": 300,
"T_shutdown": 159.3,
"T_startup": 159.3,
"T_fp": 150,
"T_loop_in_des": 293,
"T_loop_out": 391,
"T_shutdown": 325.34,
"T_startup": 325.34,
"Tau_envelope": [
[0.964000, 0.964000, 1.000000, 0.000000],
[0.964000, 0.964000, 1.000000, 0.000000],
Expand Down Expand Up @@ -324,13 +324,13 @@
"SystemCosts": {
},
"TES": {
"cold_tank_Thtr": 60,
"cold_tank_Thtr": 250,
"cold_tank_max_heat": 0.5,
"d_tank_in": 0,
"dt_hot": 5,
"h_tank_in": 15,
"h_tank_min": 0.5,
"hot_tank_Thtr": 110,
"h_tank_in": 12,
"h_tank_min": 1,
"hot_tank_Thtr": 365,
"hot_tank_max_heat": 1,
"init_hot_htf_percent": 30,
"is_h_tank_fixed": 1,
Expand All @@ -345,7 +345,7 @@
"tes_cyl_tank_insul_percent": 0,
"tes_cyl_tank_thick": 0.0254,
"tes_n_tsteps": 100,
"tes_pb_T_charge_min": 290,
"tes_pb_T_charge_min": 381,
"tes_pb_T_cold_delta": 30,
"tes_pb_T_hot_delta": 30,
"tes_pb_cp_solid": 0.83,
Expand All @@ -356,7 +356,7 @@
"tes_pb_void_frac": 0.22,
"tes_type": 1,
"tshours": 6,
"u_tank": 0.3
"u_tank": 0.4
},
"Controller": {
"T_tank_hot_inlet_min": 400,
Expand Down Expand Up @@ -431,7 +431,7 @@
"csp_dtr_cost_sales_tax_percent": 80,
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
"csp_dtr_cost_solar_field_cost_per_m2": 297,
"csp_dtr_cost_storage_cost_per_kwht": 62,
"csp_dtr_cost_storage_cost_per_kwht": 70,
"sales_tax_rate": 5
},
"FinancialParameters": {
Expand Down
24 changes: 12 additions & 12 deletions api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHLCOHCalculator.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@
[0.935000, 0.935000, 0.935000, 0.963000],
[0.935000, 0.935000, 0.935000, 0.963000]
],
"T_fp": 10,
"T_loop_in_des": 90,
"T_loop_out": 300,
"T_shutdown": 159.3,
"T_startup": 159.3,
"T_fp": 150,
"T_loop_in_des": 293,
"T_loop_out": 391,
"T_shutdown": 325.34,
"T_startup": 325.34,
"Tau_envelope": [
[0.964000, 0.964000, 1.000000, 0.000000],
[0.964000, 0.964000, 1.000000, 0.000000],
Expand Down Expand Up @@ -324,13 +324,13 @@
"SystemCosts": {
},
"TES": {
"cold_tank_Thtr": 60,
"cold_tank_Thtr": 250,
"cold_tank_max_heat": 0.5,
"d_tank_in": 0,
"dt_hot": 5,
"h_tank_in": 15,
"h_tank_min": 0.5,
"hot_tank_Thtr": 110,
"h_tank_in": 12,
"h_tank_min": 1,
"hot_tank_Thtr": 365,
"hot_tank_max_heat": 1,
"init_hot_htf_percent": 30,
"is_h_tank_fixed": 1,
Expand All @@ -345,7 +345,7 @@
"tes_cyl_tank_insul_percent": 0,
"tes_cyl_tank_thick": 0.0254,
"tes_n_tsteps": 100,
"tes_pb_T_charge_min": 290,
"tes_pb_T_charge_min": 381,
"tes_pb_T_cold_delta": 30,
"tes_pb_T_hot_delta": 30,
"tes_pb_cp_solid": 0.83,
Expand All @@ -356,7 +356,7 @@
"tes_pb_void_frac": 0.22,
"tes_type": 1,
"tshours": 6,
"u_tank": 0.3
"u_tank": 0.4
},
"Controller": {
"T_tank_hot_inlet_min": 400,
Expand Down Expand Up @@ -458,7 +458,7 @@
"csp_dtr_cost_sales_tax_percent": 80,
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
"csp_dtr_cost_solar_field_cost_per_m2": 297,
"csp_dtr_cost_storage_cost_per_kwht": 62,
"csp_dtr_cost_storage_cost_per_kwht": 70,
"sales_tax_rate": 5
},
"FinancialParameters": {
Expand Down
24 changes: 12 additions & 12 deletions api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHNone.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@
[0.935000, 0.935000, 0.935000, 0.963000],
[0.935000, 0.935000, 0.935000, 0.963000]
],
"T_fp": 10,
"T_loop_in_des": 90,
"T_loop_out": 300,
"T_shutdown": 159.3,
"T_startup": 159.3,
"T_fp": 150,
"T_loop_in_des": 293,
"T_loop_out": 391,
"T_shutdown": 325.34,
"T_startup": 325.34,
"Tau_envelope": [
[0.964000, 0.964000, 1.000000, 0.000000],
[0.964000, 0.964000, 1.000000, 0.000000],
Expand Down Expand Up @@ -324,13 +324,13 @@
"SystemCosts": {
},
"TES": {
"cold_tank_Thtr": 60,
"cold_tank_Thtr": 250,
"cold_tank_max_heat": 0.5,
"d_tank_in": 0,
"dt_hot": 5,
"h_tank_in": 15,
"h_tank_min": 0.5,
"hot_tank_Thtr": 110,
"h_tank_in": 12,
"h_tank_min": 1,
"hot_tank_Thtr": 365,
"hot_tank_max_heat": 1,
"init_hot_htf_percent": 30,
"is_h_tank_fixed": 1,
Expand All @@ -345,7 +345,7 @@
"tes_cyl_tank_insul_percent": 0,
"tes_cyl_tank_thick": 0.0254,
"tes_n_tsteps": 100,
"tes_pb_T_charge_min": 290,
"tes_pb_T_charge_min": 381,
"tes_pb_T_cold_delta": 30,
"tes_pb_T_hot_delta": 30,
"tes_pb_cp_solid": 0.83,
Expand All @@ -356,7 +356,7 @@
"tes_pb_void_frac": 0.22,
"tes_type": 1,
"tshours": 6,
"u_tank": 0.3
"u_tank": 0.4
},
"Controller": {
"T_tank_hot_inlet_min": 400,
Expand Down Expand Up @@ -458,7 +458,7 @@
"csp_dtr_cost_sales_tax_percent": 80,
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
"csp_dtr_cost_solar_field_cost_per_m2": 297,
"csp_dtr_cost_storage_cost_per_kwht": 62,
"csp_dtr_cost_storage_cost_per_kwht": 70,
"sales_tax_rate": 5
},
"FinancialParameters": {
Expand Down
26 changes: 13 additions & 13 deletions api/api_autogen/library/defaults/TroughPhysicalIph_PhysicalTroughIPHSingleOwner.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@
[0.935000, 0.935000, 0.935000, 0.963000],
[0.935000, 0.935000, 0.935000, 0.963000]
],
"T_fp": 10,
"T_loop_in_des": 90,
"T_loop_out": 300,
"T_shutdown": 159.3,
"T_startup": 159.3,
"T_fp": 150,
"T_loop_in_des": 293,
"T_loop_out": 391,
"T_shutdown": 325.34,
"T_startup": 325.34,
"Tau_envelope": [
[0.964000, 0.964000, 1.000000, 0.000000],
[0.964000, 0.964000, 1.000000, 0.000000],
Expand Down Expand Up @@ -324,13 +324,13 @@
"SystemCosts": {
},
"TES": {
"cold_tank_Thtr": 60,
"cold_tank_Thtr": 250,
"cold_tank_max_heat": 0.5,
"d_tank_in": 0,
"dt_hot": 5,
"h_tank_in": 15,
"h_tank_min": 0.5,
"hot_tank_Thtr": 110,
"h_tank_in": 12,
"h_tank_min": 1,
"hot_tank_Thtr": 365,
"hot_tank_max_heat": 1,
"init_hot_htf_percent": 30,
"is_h_tank_fixed": 1,
Expand All @@ -345,7 +345,7 @@
"tes_cyl_tank_insul_percent": 0,
"tes_cyl_tank_thick": 0.0254,
"tes_n_tsteps": 100,
"tes_pb_T_charge_min": 290,
"tes_pb_T_charge_min": 381,
"tes_pb_T_cold_delta": 30,
"tes_pb_T_hot_delta": 30,
"tes_pb_cp_solid": 0.83,
Expand All @@ -356,7 +356,7 @@
"tes_pb_void_frac": 0.22,
"tes_type": 1,
"tshours": 6,
"u_tank": 0.3
"u_tank": 0.4
},
"Controller": {
"T_tank_hot_inlet_min": 400,
Expand Down Expand Up @@ -430,7 +430,7 @@
"ppa_soln_mode": 1
},
"Revenue": {
"ppa_price_input_heat_btu": [15.000000]
"ppa_price_input_heat_btu": [19.000000]
},
"TimeOfDeliveryFactors": {
},
Expand Down Expand Up @@ -460,7 +460,7 @@
"csp_dtr_cost_sales_tax_percent": 80,
"csp_dtr_cost_site_improvements_cost_per_m2": 16,
"csp_dtr_cost_solar_field_cost_per_m2": 297,
"csp_dtr_cost_storage_cost_per_kwht": 62,
"csp_dtr_cost_storage_cost_per_kwht": 70,
"sales_tax_rate": 5
},
"FinancialParameters": {
Expand Down
3 changes: 2 additions & 1 deletion deploy/runtime/cashflow.lk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ function cf_om_expenses()
{
cfline( 'cf_om_fixed2_expense,cf_om_production2_expense,cf_om_capacity2_expense', 0);
cfline( 'cf_fuelcell_replacement_cost', 0);
cfline( 'cf_om_fuel_expense', 0);
}
if ( is_fuel_tech() ) { cfline('cf_om_fuel_expense', 0); }
if ( tech == 'Biopower' ) { cfline( 'cf_om_opt_fuel_1_expense,cf_om_opt_fuel_2_expense', 0); }
Expand Down Expand Up @@ -379,7 +380,7 @@ function cf_operating_expenses()
cf_om_expenses();
cfline( 'cf_property_tax_expense', 0);
cfline( 'cf_insurance_expense', 0);
if ( is_land_lease_config() ) { cfline('cf_land_lease_expense', 0); }
if ( is_land_lease_config() && strpos(technology(),'Hybrid') < 0 ) { cfline('cf_land_lease_expense', 0); } // hybrid land lease handled in cf_om_expenses() function
if ( fin == 'Community Solar')
{
cfline('cf_community_solar_recurring_fixed', 0);
Expand Down
Loading

0 comments on commit 7deb0e1

Please sign in to comment.