Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IPH models pull request #1238

Merged
merged 114 commits into from
Nov 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
114 commits
Select commit Hold shift + click to select a range
8d14a17
calculate and assign system capacity in cmod
tyneises Sep 29, 2023
91b5d52
add system capacity outputs
tyneises Sep 29, 2023
a6642f6
calculate construction costs in mslf cmod
tyneises Sep 29, 2023
915a670
calculate construction costs in mslf iph cmod
tyneises Sep 29, 2023
9ff382b
Merge branch 'develop' into mslf-for-so
tyneises Sep 29, 2023
95a0ae5
enable single owner for mslf iph
tyneises Sep 29, 2023
44c88d7
make nameplate units consistent in mslf
tyneises Sep 29, 2023
4d5686e
update mspt iph cmod for single owner
tyneises Sep 30, 2023
2827b11
add dispatch optimization for mspt iph
tyneises Oct 1, 2023
b5d0960
add dispatch optimization for mslf iph
tyneises Oct 3, 2023
4ffbf3c
comment line that writes cmod to file
tyneises Oct 3, 2023
0d5b825
add electricity purchases operating expense for heat models
tyneises Oct 8, 2023
d19d47d
Merge branch 'develop' into mslf-for-so
tyneises Nov 7, 2023
cc9056d
Merge branch 'develop' into mslf-for-so
tyneises Nov 8, 2023
d40ffd0
merge patch
tyneises Feb 19, 2024
5931752
Merge branch 'patch' into mslf-for-so
tyneises Mar 14, 2024
97ce078
Merge branch 'develop' into iph-single-owner
tyneises Mar 18, 2024
5fb2b5b
update cmod for required if for new auto exec check
tyneises Mar 18, 2024
6b2dd7a
start modifying cmod for dispatch
tyneises Mar 18, 2024
816e29b
update for iph single owner
tyneises Mar 18, 2024
1217bee
merge develop
tyneises Mar 18, 2024
638521e
get commercial fin model working
tyneises Mar 19, 2024
1aaf633
add simulation_parameter to utility rate common
Apr 4, 2024
8dbba57
make inflation rate in utility rate common an optional input
tyneises Apr 4, 2024
817ee73
clean up trough iph cmod
tyneises May 22, 2024
dda7f7b
merge develop
tyneises May 30, 2024
76c967f
fix commercial finance model option in cmod
tyneises May 30, 2024
b5fd079
Merge branch 'develop' into iph-split-heat-elec-pricing
tyneises May 31, 2024
14fa591
fix issue from merging develop
tyneises May 31, 2024
43c93c2
add electricity pricing inputs for trough iph lcoh model
tyneises May 31, 2024
4c8c7ec
add heat pricing schedule
tyneises May 31, 2024
26e8f5a
fix heat pricing schedule
tyneises May 31, 2024
c56e43f
cleaning up dispatch update_horizon_parameters()
qualand May 31, 2024
e5d9db6
removed old TOU member setting
qualand Jun 4, 2024
8a6e605
cleaning up dispatch inputs
qualand Jun 4, 2024
3cc3724
replacing array to vector with as_vector()
qualand Jun 6, 2024
c088b2c
adding cst iph dispatch to trough IPH model
qualand Jun 6, 2024
6a0409b
heat load capacity factor for IPH trough
qualand Jun 7, 2024
b21f07b
Merge branch 'develop' into iph-split-heat-elec-pricing
qualand Jun 11, 2024
1a6b9c7
replace cmod inputs presumably lost in develop merge
tyneises Jun 13, 2024
fc0a2f6
adjusted heat load capacity factor
qualand Jun 18, 2024
619dda5
remove SIMULATION PARAMETER label for timestep_load_fractions
tyneises Jul 31, 2024
b2ed64d
have C_CR_DF__PC_MAX__TES_OFF__AUX_OFF turn off solar field upon fail…
tyneises Jul 31, 2024
bbcef4f
Add startup temp and shutdown temp as user inputs.
taylorbrown75 Mar 26, 2024
da4fefe
Add checks for missing T_startup or T_shutdown
taylorbrown75 Aug 1, 2024
0c3271a
Add optional startup and shutdown temperatures to iph cmod.
taylorbrown75 Aug 1, 2024
ecec61a
change from ? required to empty
tyneises Aug 2, 2024
ea545a1
Merge branch 'develop' into iph-split-heat-elec-pricing
tyneises Aug 7, 2024
39ab404
Merge branch 'develop' into iph-split-heat-elec-pricing-v2
taylorbrown75 Sep 11, 2024
48f89fd
Fix bug from merge.
taylorbrown75 Sep 11, 2024
0d98ff8
Squashed commit of the following:
taylorbrown75 Sep 12, 2024
28c2f20
Squashed commit of the following:
taylorbrown75 Sep 17, 2024
d31362a
Fix trough iph bug from merge.
taylorbrown75 Sep 17, 2024
941a093
Merge branch 'develop' into iph-split-heat-elec-pricing-v2
taylorbrown75 Oct 4, 2024
52f4c28
Merge branch 'develop' into iph-split-heat-elec-pricing-v2
taylorbrown75 Oct 4, 2024
8fe92cc
Merge remote-tracking branch 'origin/develop' into iph_fin_cmods
sjanzou Oct 8, 2024
77fb224
Add cmod_cashloan_heat and cmod_singleowner_heat
sjanzou Oct 8, 2024
d424d28
Merge remote-tracking branch 'origin/develop' into iph_fin_cmods
sjanzou Oct 9, 2024
f5fa339
update single owner from latest develop version
sjanzou Oct 9, 2024
b74c5df
Merge branch 'develop' into iph_fin_cmods
sjanzou Oct 15, 2024
d39923e
Update IPH MSPT to output "load" to call cmod_utilityrate5
sjanzou Oct 15, 2024
36d08c9
Merge branch 'develop' into iph_fin_cmods
sjanzou Oct 16, 2024
3ce0bbf
Update cf_om_elec_price__for_heat_techs to utility_bill_wo_sys
sjanzou Oct 16, 2024
1192d73
adding electric heater into trough IPH model
qualand Oct 17, 2024
776e287
Add load output to IPH trough and fresnel. Change gen to gen_heat. Ch…
taylorbrown75 Oct 18, 2024
741a73c
Merge branch 'develop' into iph_fin_cmods
sjanzou Oct 22, 2024
e50d00f
Merge remote-tracking branch 'origin/develop' into iph_fin_cmods
sjanzou Oct 24, 2024
ce19e5f
Add thermalrate_iph cmod and configure gen and gen_heat for IPH models.
taylorbrown75 Oct 25, 2024
53bea61
Merge branch 'iph_fin_cmods' of https://github.com/nrel/ssc into iph_…
taylorbrown75 Oct 25, 2024
034af65
Remove curtailment and capacity inputs and revenue streams for heat
sjanzou Oct 27, 2024
c88364d
Remove capacity payment input dependency for cmod_singleowner_heat
sjanzou Oct 27, 2024
700751a
Update hourly_calculations class to handle heat values
sjanzou Oct 28, 2024
6b419ba
Merge branch 'develop' into iph_fin_cmods
sjanzou Oct 28, 2024
861034c
Update o and m and cash flow for cmod_singleowner_heat
sjanzou Oct 29, 2024
4362ff5
Merge remote-tracking branch 'origin/develop' into iph_fin_cmods
sjanzou Oct 30, 2024
c7c9eb0
Add additional heat outputs
sjanzou Oct 30, 2024
80abf6a
Add monthly thermal rate options.
taylorbrown75 Oct 30, 2024
c519d65
Merge remote-tracking branch 'origin/develop' into iph_fin_cmods
sjanzou Oct 30, 2024
1733bd1
Merge branch 'iph_fin_cmods' of https://github.com/nrel/ssc into iph_…
taylorbrown75 Oct 30, 2024
8fa9f29
Add conversion efficiency to thermal buy rates.
taylorbrown75 Oct 30, 2024
5e77079
Update IPH direct steam linear fresnel cmod to work for single owner
taylorbrown75 Oct 30, 2024
afa33b9
Update heatmaps for all iph technologies
sjanzou Oct 31, 2024
7ad514d
Add nameplate capacity outputs to IPH fresnel direct steam.
taylorbrown75 Oct 31, 2024
1a1d21a
Fix bug with annual_field_energy.
taylorbrown75 Nov 1, 2024
2917884
Align IPH tech cmod kWht and kWhe naming convention.
taylorbrown75 Nov 1, 2024
ab5afdc
Merge remote-tracking branch 'origin/develop' into iph_fin_cmods
sjanzou Nov 1, 2024
bb61128
Add MMBtu energy outputs to IPH tech cmods for display.
taylorbrown75 Nov 1, 2024
abea27e
Heat incentive updates
sjanzou Nov 3, 2024
5b7a910
cmod_singleowner_heat ready for testing
sjanzou Nov 4, 2024
3bffdaa
Fix load assignment in thermal rate compute module and cashloan_heat …
sjanzou Nov 4, 2024
9aa17dc
Update trough LCOH model to match tower and MSLF method.
taylorbrown75 Nov 4, 2024
00eb9a8
Rename piston cylinder TES model.
taylorbrown75 Nov 4, 2024
a1faa23
Merge branch 'develop' into iph_fin_cmods
sjanzou Nov 7, 2024
7086167
Update thermal buy/sell rate unit. Fix bug importing thermal load var…
taylorbrown75 Nov 7, 2024
6b241bb
Merge branch 'develop' into iph_fin_cmods
sjanzou Nov 8, 2024
e937920
Merge branch 'iph_fin_cmods' of https://github.com/nrel/ssc into iph_…
taylorbrown75 Nov 8, 2024
2f96214
Squashed commit of the following:
taylorbrown75 Nov 8, 2024
787cb76
Add option for absolute thermal load hourly input for system control.
taylorbrown75 Nov 11, 2024
4601202
Remove unused heat dispatch calls.
taylorbrown75 Nov 11, 2024
957a791
Remove construction financials from non single owner IPH models.
taylorbrown75 Nov 11, 2024
8727054
Add construction financing equations to trough and fresnel cmods.
taylorbrown75 Nov 12, 2024
47e6211
Define trough financial model in tests.
taylorbrown75 Nov 12, 2024
cb70a18
Clarify and sync CSP output labels to remove 'grid' terminology.
taylorbrown75 Nov 12, 2024
bdf8233
Shorten CSP generation vartable labels.
taylorbrown75 Nov 12, 2024
dc93257
Merge branch 'develop' into iph_fin_cmods
sjanzou Nov 14, 2024
1a06aba
2024.11.14.ssc.295 IPH beta expires 1/31/2025
sjanzou Nov 14, 2024
de25033
Define IPH monthly load output. Remove unused variables and function.
taylorbrown75 Nov 14, 2024
dbbb015
Merge branch 'iph_fin_cmods' of https://github.com/nrel/ssc into iph_…
taylorbrown75 Nov 14, 2024
b58cf62
Add cash flow net heat output in MMBtu to IPH single owner and cashlo…
taylorbrown75 Nov 15, 2024
71e2ec0
Fix bug outputting energy output in MMBtu
taylorbrown75 Nov 15, 2024
d77fb88
Fix bug assigning array in cashloan_heat
taylorbrown75 Nov 18, 2024
a008f8f
Add commercial model to IPH fresnel.
taylorbrown75 Nov 18, 2024
17fe9c1
Merge branch 'develop' into iph_fin_cmods
taylorbrown75 Nov 19, 2024
444fda3
Delete duplicate vartable variables.
taylorbrown75 Nov 19, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'develop' into iph_fin_cmods
sjanzou committed Nov 14, 2024
commit dc9325718633cf591f328cbbe05bb2fdc1f0d15f

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.