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.

Sign up for GitHub

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

New Hybrid Configurations #1448

Merged
merged 200 commits into from
Sep 18, 2023
Merged

New Hybrid Configurations #1448

Show file tree
Hide file tree
Changes from 197 commits
Commits
Show all changes
200 commits
Select commit Hold shift + click to select a range
85c8438
Dropdowns in input page menu
mjprilliman Mar 16, 2023
c996503
Initial test setup for hybrid UI
cpaulgilman Mar 16, 2023
9208c79
add bin_name flag to startup for binning input pages to dropdowns, fix
mjprilliman Mar 17, 2023
8a828ec
Merge branch 'hybrid-ui-configs' into input_page_dropdown
cpaulgilman Mar 20, 2023
ea2a9d0
Update startup script for collapsible navigation menu
cpaulgilman Mar 20, 2023
76c410e
Go to first page when container is selected; fix page indexing for
mjprilliman Mar 20, 2023
ff200f1
Fix mystery scroll bar, editable text boxes for input page tabs
mjprilliman Mar 21, 2023
4cd45f4
Add battery dispatch to battery bin for hybrid example
mjprilliman Mar 21, 2023
6c53f5d
Split config label into two lines; split input page groups by bin name
mjprilliman Mar 24, 2023
b274d28
Two line config label; Fix input page bins to search by string; populate
mjprilliman Mar 27, 2023
94b9fd4
Merge branch 'develop' into input_page_dropdown
mjprilliman Mar 28, 2023
05676e5
Check for Retired bin, rename tree parents to use startup rather than
mjprilliman Mar 29, 2023
c6bba3d
Merge branch 'input_page_dropdown' into hybrids
sjanzou Apr 16, 2023
b8435c8
initial export config updates - failing with hybrids
sjanzou Apr 16, 2023
9c1d2cd
Fix Ctrl+F7 issue from Ty 4/17/2023
sjanzou Apr 18, 2023
daa83c9
Merge remote-tracking branch 'origin/develop' into hybrids
sjanzou Apr 19, 2023
06aedb3
Remove grid outage form from component inputs
cpaulgilman Apr 20, 2023
2928c9a
Remove wind uncertainty form from hybrid configs
cpaulgilman Apr 20, 2023
36fc7aa
Use `bin_name` capitalization
cpaulgilman Apr 20, 2023
0acd8d2
Remove pvsamv3 from startup.lk
cpaulgilman Apr 20, 2023
8650f60
Experiment with background color for config panel
cpaulgilman Apr 20, 2023
123b804
updated defaults
sjanzou Apr 23, 2023
1513afc
Merge branch 'mspt_no_finance' into hybrids
sjanzou Apr 29, 2023
13844f7
export config updates after merge
sjanzou Apr 29, 2023
997a38c
Fix FOM battery dispatch options in UI for hybrid config
cpaulgilman May 1, 2023
0fec67b
Fix UI callback errors
cpaulgilman May 1, 2023
b1d1664
Merge branch 'mspt_no_finance' into hybrids
sjanzou May 2, 2023
470fd70
Update defaults - still changing for hybrids
sjanzou May 5, 2023
288c31a
Merge branch 'develop' into hybrids
sjanzou May 5, 2023
9307c57
ConfigInfo and ConfigDatabase updates for hybrids
sjanzou May 8, 2023
9a051d8
hybrid updates (not complete) to case
sjanzou May 9, 2023
1273222
hybrid case and variable updates
sjanzou May 12, 2023
7ca287c
Updates for new configInfo and configdatabase and case multiple varia…
sjanzou May 13, 2023
5f997fa
Fix all compilation errors and messages when starting SAM
sjanzou May 14, 2023
6a33078
Fix non-hybrid default loading issue
sjanzou May 15, 2023
0674986
All 158 non-hybrid defaults running - equations working in new framework
sjanzou May 16, 2023
2dd293b
Fix non-hybrid loading in Case::Copy
sjanzou May 16, 2023
c05b277
Update SaveDefaults for Hybrids
sjanzou May 29, 2023
a194196
Case::SaveDefaults updated for hybrids
sjanzou May 30, 2023
49d5eba
SaveDefaults now saving hybrid configurations
sjanzou Jun 1, 2023
511bfd4
Update pagelist and left side navigation for hybrids
sjanzou Jun 2, 2023
eaf405b
Updates for hybrids - issue with results viewer loading
sjanzou Jun 5, 2023
f6d3205
Callbacks starting to work for hybrids as long as all variables in on…
sjanzou Jun 6, 2023
442dd21
Merge branch 'develop' into hybrids
sjanzou Jun 8, 2023
4923b13
export_config updates
sjanzou Jun 8, 2023
7c72e43
Rewrite LoadDefaults based on SaveDefaults
sjanzou Jun 8, 2023
c095df9
Merge branch 'develop' into hybrids
sjanzou Jun 9, 2023
4a9e1b5
Fix exception error and blank dialog
sjanzou Jun 9, 2023
d06c74c
Merge branch 'develop' into hybrids
sjanzou Jun 11, 2023
8da9dc8
Fix issue with infinite loop updating wind resource
sjanzou Jun 11, 2023
015ac5c
Remove unused .txt forms and update PV Capital Costs for hybrids
sjanzou Jun 12, 2023
93d2fc8
Update defaults and fix collapsible panes and radio button page selec…
sjanzou Jun 12, 2023
0068ea0
Fix hybrid configuration case saving and loading
sjanzou Jun 13, 2023
061ad71
Manual handling of variables used across VarTables for testing
sjanzou Jun 15, 2023
1d7f547
Add hybrid summary page to test HybridVariableDependencies struct
sjanzou Jun 17, 2023
b621d3c
Setup variables for cross vartable updating in equations and callbacks
sjanzou Jun 18, 2023
53446bd
equations working with HybridVariableDependencies
sjanzou Jun 19, 2023
f5fd9df
Update overloaded Case::Recalculate and update defaults
sjanzou Jun 20, 2023
bdee68b
add inflation rate to each vartable for o and m calculaitons
sjanzou Jun 23, 2023
0785c23
Testing inputs in Hybrid Summary, remove pages from results page
mjprilliman Jun 23, 2023
fed6ca4
Update defaults
sjanzou Jun 24, 2023
d3a5012
Update degradation pages for single year analysis like single tech co…
sjanzou Jun 25, 2023
7ff2edb
Update hybrid configuration to use "windpower" instead of "wind" comp…
sjanzou Jun 26, 2023
2029c03
Update defaults and add additional dependencies for running "battery"…
sjanzou Jun 27, 2023
8bb647f
export_config updates
sjanzou Jun 29, 2023
8535a15
Simulation updates for hybrids through output processing
sjanzou Jun 29, 2023
628814d
Beginning to put in hybrid tag for outputs in results, handle table
mjprilliman Jun 29, 2023
0248b19
Update additional dependencies for battery in hybrid / single owner
sjanzou Jun 30, 2023
2d910e6
partially working hybrids / single owner configuration for 6/30/2023 …
sjanzou Jun 30, 2023
7658b02
Updating hybrid summary page with additional inputs
mjprilliman Jun 30, 2023
cf09efc
Merge branch 'hybrid-working' into hybrids
sjanzou Jun 30, 2023
cf81f2b
Update hybrids defaults and additional battery dependencies
sjanzou Jul 2, 2023
7e32a34
Update default financial parameters for single owner
sjanzou Jul 3, 2023
f19ab98
Update on_load processing for hybrids
sjanzou Jul 3, 2023
193e439
Fix battery pages used for hybrid configurations
sjanzou Jul 4, 2023
48d8164
hybrid single owner and host developer running after manually selecti…
sjanzou Jul 5, 2023
fea36d8
hybrid single owner and host developer working for manual dispatch, w…
sjanzou Jul 5, 2023
154f29f
Testing total_installed_cost printing, results tables from table outputs
mjprilliman Jul 5, 2023
7848268
Update output labels and names
sjanzou Jul 6, 2023
4f382b2
Merge branch 'hybrids' of https://github.com/nrel/sam into hybrids
mjprilliman Jul 6, 2023
0fc6968
Update metrics for hybrid single owner configuraiton
sjanzou Jul 9, 2023
b7cacbd
hybrid defaults and summary page updates
sjanzou Jul 11, 2023
bf219b1
defaults and results updates
sjanzou Jul 11, 2023
1b7de55
Merge branch 'hybrids' of https://github.com/nrel/sam into hybrids
mjprilliman Jul 11, 2023
2724b3e
Temporary on_load fix for wind total_installed_cost display issue
mjprilliman Jul 11, 2023
dc02c8f
Updates for hybrids to Simulation::m_inputs
sjanzou Jul 12, 2023
1094b11
Fix timeseries and heatmap list issue for hybrids
sjanzou Jul 13, 2023
1f73a21
Update results handling and labeling for hybrids
sjanzou Jul 15, 2023
25c346e
comments updates and o and m for each hybrid in data tables
sjanzou Jul 16, 2023
69fa40d
Fix failing SAM_api project and update cashflow for hybrid single owner
sjanzou Jul 17, 2023
69adf84
Hybrids cash flow updates - PV-Batt /SO having issues - check develop
sjanzou Jul 18, 2023
5edfba2
Fix issues with single tech configurations and ResultsViewer::Setup
sjanzou Jul 19, 2023
c5998ac
Update hybrids to have incentives for each subcomponent
sjanzou Jul 19, 2023
e7a9f62
Defaults and results updates for hybrids
sjanzou Jul 21, 2023
3ba7213
initial ui fixes
cpaulgilman Jul 21, 2023
68d0e40
Merge branch 'hybrids' into paul-hybrid-ui
cpaulgilman Jul 21, 2023
49fb700
Add calculated values to hybrid pages
cpaulgilman Jul 21, 2023
d1cdff3
Updates to incentives per 7/21/2023 meeting and for alpha version
sjanzou Jul 23, 2023
268725e
Hybrid Host developer updates for alpha release
sjanzou Jul 23, 2023
636c03a
Fix issue with ResultsViewer::Setup causing Wind configurations to fails
sjanzou Jul 24, 2023
22fb810
Merge remote-tracking branch 'origin/paul-hybrid-ui' into hybrids
sjanzou Jul 24, 2023
a5d0a21
2023.7.24.ssc.281 beta release
sjanzou Jul 24, 2023
3b4d118
Hybrid navigation UI fixes
cpaulgilman Jul 25, 2023
6fb48d3
Fix configuration colors and add tooltips
cpaulgilman Jul 25, 2023
d1d601a
Fix AC Capacity on Land Area Estimates for PV and update defaults
sjanzou Jul 26, 2023
594417c
Update hybrid output naming and start on parametrics
sjanzou Jul 27, 2023
17c2841
Merge branch 'hybrids' of https://github.com/nrel/sam into hybrids
mjprilliman Jul 27, 2023
5aee4fd
parametric updates for hybrids
sjanzou Jul 28, 2023
be76310
Parametric updates
sjanzou Jul 30, 2023
904718d
Hybrid parametrics running with some labelling issues
sjanzou Jul 31, 2023
a383bfd
Testing hybrid system summary page at top of list
mjprilliman Jul 31, 2023
4245c38
Quick setup working for non-hybrids and not for hybrids
sjanzou Aug 1, 2023
a29a104
tag quick setup changes for hybrids
sjanzou Aug 1, 2023
13d72e0
Add hybrid summary bin to top of input pages
mjprilliman Aug 1, 2023
bbaca01
Remove stochastic and P50/P90 tabs for hybrid systems
mjprilliman Aug 1, 2023
0108fe5
Merge branch 'hybrids' of https://github.com/nrel/sam into hybrids
mjprilliman Aug 1, 2023
6337dd1
Fix broken hybrid defaults
sjanzou Aug 2, 2023
b342852
Parametric quick setup mostly working for hybrids
sjanzou Aug 2, 2023
5ac5c8d
Fix Quick Setup functionality for hybrids - saving and loading issues…
sjanzou Aug 3, 2023
8ddaf21
Paramertic quick setup working for hybrids and non-hybrids
sjanzou Aug 4, 2023
23d4019
parametrics working all except import - working on input browser
sjanzou Aug 6, 2023
79bf945
remove unnecessary changes for hybrids
sjanzou Aug 8, 2023
60ca113
Partial updates to VariableGridFrame and VariableGridData classes
sjanzou Aug 10, 2023
9607873
Merge remote-tracking branch 'origin/develop' into hybrids
sjanzou Aug 10, 2023
6506bcd
Input browser working for single hybrid and non-hybrid cases
sjanzou Aug 10, 2023
ad87fe9
Fix capex table option inputs and defaults
cpaulgilman Aug 10, 2023
152be9d
rename hybrid bin placeholder
cpaulgilman Aug 10, 2023
f6d4766
Customize installation page labels for hybrid configs
cpaulgilman Aug 11, 2023
5e11a3b
Use square plot with equal axes for wind farm layout
cpaulgilman Aug 11, 2023
c80bd7d
Macros for hybrid configs
cpaulgilman Aug 11, 2023
d982102
Fix MacOS build errors
sjanzou Aug 12, 2023
e4fa94f
Inputs browser working for hybrids
sjanzou Aug 15, 2023
deb6d16
Fix PVWatts DC/AC ratio for hybrids
cpaulgilman Aug 15, 2023
0b08266
Merge branch 'hybrids' of https://github.com/NREL/SAM into hybrids
cpaulgilman Aug 15, 2023
cbd42fc
Fix hybrid O and M costs and update defaults
sjanzou Aug 16, 2023
6b95036
Update hybrid defaults for calculated UI values
cpaulgilman Aug 16, 2023
7cd930d
Remove PV smoothing from hybrid and standalone FOM battery configurat…
cpaulgilman Aug 16, 2023
f45bcb5
All 160 default configurations running on Windows
sjanzou Aug 17, 2023
31e2265
Add other configs for hybrids
mjprilliman Aug 17, 2023
d9baf3a
Update Hybrid Costs equations for options fuel_cell_total_installed_cost
sjanzou Aug 18, 2023
8a9d81d
work on fuel cell configurations -still not running
sjanzou Aug 18, 2023
a3a1b97
Update test_results_win64.csv
cpaulgilman Aug 18, 2023
4065155
Merge branch 'hybrids' of https://github.com/NREL/SAM into hybrids
cpaulgilman Aug 18, 2023
23c0fe5
Fuel cell startup cleanup, menu select clear on results page, update
mjprilliman Aug 18, 2023
9717cc9
Merge branch 'hybrids' of https://github.com/nrel/sam into hybrids
mjprilliman Aug 18, 2023
8f93bbc
Fix hybrid configs with fuel cell
cpaulgilman Aug 19, 2023
110f8df
Fix issues after attempted merge conflict resolution
cpaulgilman Aug 19, 2023
e65d5ce
Fix broken PVWatts-Wind-Battery Hybrid configurations
sjanzou Aug 22, 2023
a5b8431
PVWatts - Wind - Fuel Cell - Battery / single Owner running
sjanzou Aug 22, 2023
b138419
Menu's switching correctly except for arrows
mjprilliman Aug 22, 2023
a72b983
Merge branch 'hybrids' of https://github.com/nrel/sam into hybrids
mjprilliman Aug 22, 2023
29fbd17
Cleanup of tree, how are arrows being triggered?
mjprilliman Aug 22, 2023
9fd2d03
Fix Hybrid System UI form for Detailed PV configs
cpaulgilman Aug 22, 2023
3d493e0
Preliminary dummy defaults for testing hybrid config UI
cpaulgilman Aug 22, 2023
77efd6c
Merge branch 'hybrids' of https://github.com/NREL/SAM into hybrids
cpaulgilman Aug 22, 2023
e616473
Fix UI form for Fuel Cell configs
cpaulgilman Aug 22, 2023
01fc111
api and defaults updates
sjanzou Aug 23, 2023
854e596
Merge remote-tracking branch 'origin/hybrids' into hybrids
sjanzou Aug 23, 2023
851e69c
PVWatts-Wind-FuelCell-Battery SO and HD working
sjanzou Aug 23, 2023
1a1420d
Remove land lease ui form from hybrid TPO Host-Developer configs
cpaulgilman Aug 23, 2023
1a4cec5
Add battery salvage value ui form and defaults to hybrid configs
cpaulgilman Aug 23, 2023
a9eacb0
Update PVWatts Wind Battery Hybrid_Host Developer.json
cpaulgilman Aug 23, 2023
650d99e
Handle optional land lease cost in hybrid configurations.
sjanzou Aug 24, 2023
ca595da
Update PVWatts Wind Battery Hybrid defaults
cpaulgilman Aug 24, 2023
3d087db
Fix degradation default widgets
cpaulgilman Aug 24, 2023
db5d3ba
Update PVWatts Wind Battery Hybrid autographs
cpaulgilman Aug 24, 2023
2e29fca
Fix fuel cell dispatch forms
cpaulgilman Aug 24, 2023
fee021c
Bunch of hacky UI form fixes for FOM hybrid with fuel cell
cpaulgilman Aug 24, 2023
3191504
Fix fuel cell fuel cost datatype and other UI tweaks
cpaulgilman Aug 24, 2023
deb7d23
Initial defaults for PVWatts Wind FuelCell Battery Hybrid / SO config
cpaulgilman Aug 24, 2023
0f8abb3
Fix broken PVWatts-Wind-FuelCell-Battery configurations
sjanzou Aug 25, 2023
c552ef8
Initial setup of separate fuel cell and battery dispatch pages
cpaulgilman Aug 25, 2023
bb7fb48
PV-wind-Battery / single Owner initially running with manual dispatch
sjanzou Aug 27, 2023
406dbab
Working through all battery dependencies in pvsamv1
sjanzou Aug 28, 2023
2bc72ed
REvise navigation tree behavior, add top level pages for bin summary
mjprilliman Sep 1, 2023
b29eae5
Merge branch 'hybrids' of https://github.com/nrel/sam into hybrids
mjprilliman Sep 1, 2023
1ecf178
Merge remote-tracking branch 'origin/develop' into hybrids
sjanzou Sep 2, 2023
39c7920
PV-Wind_Battery / single Owner running with defaults - fails when cha…
sjanzou Sep 2, 2023
6d7863f
Update PV-wind-Battery defaults - issue with pGen in cmod_hybrid
sjanzou Sep 2, 2023
28f88fc
PV-Wind-Battery configurations initially running
sjanzou Sep 3, 2023
3d33f5e
Generic-PVWatts-Wind-FuelCell-Battery Single Owner initially running …
sjanzou Sep 4, 2023
f5da675
All hybrid configurations running - 166 default results committed
sjanzou Sep 5, 2023
27d147f
Load in correct first page for hybrids, fix page switching for
mjprilliman Sep 7, 2023
c5a77da
Separate fuel cell and battery dispatch pages
cpaulgilman Sep 7, 2023
c409557
Merge branch 'hybrids' into fuel-cell-dispatch-pages
cpaulgilman Sep 7, 2023
6f04314
Fix fuel cell default input dispatch to avoid simulation error
cpaulgilman Sep 7, 2023
6b4959b
Update version upgrade script processing and api updates
sjanzou Sep 8, 2023
e3ccc29
Version upgrade script for fuel cell
cpaulgilman Sep 8, 2023
50646fc
Separate battery and fuel cell dispatch pages for hybrid configs
cpaulgilman Sep 8, 2023
ee4ba31
Fix wind loss tab order mode
cpaulgilman Sep 8, 2023
5ba1821
BTM Hybrid fuel cell config defaults
cpaulgilman Sep 8, 2023
6767c03
Hybrid with fuel cell defaults for FOM
cpaulgilman Sep 8, 2023
124c86c
All defaults configurations running on Windows
sjanzou Sep 10, 2023
af03aab
Hybrid system and costs page updates
cpaulgilman Sep 13, 2023
82b426a
Fix issues with Generic-PVWatts-Wind-FuelCell-Battery configurations
sjanzou Sep 14, 2023
e3f7ff6
Update test_results_win64.csv with hybrid configuration results
cpaulgilman Sep 14, 2023
6ce1c23
Change default ur_metering_option to buy all / sell all for Hybrid FOM
sjanzou Sep 15, 2023
3e252ad
Address several TODO items per comments on #1448
sjanzou Sep 17, 2023
65a3974
Merge branch 'develop' into hybrids
sjanzou Sep 18, 2023
6f7557d
Updated PV hybrids defaults and updated default results.
sjanzou Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
918 changes: 0 additions & 918 deletions api/api_autogen/library/defaults/BatteryStateful_LFPGraphite.json
View file
Open in desktop

This file was deleted.

77 changes: 0 additions & 77 deletions api/api_autogen/library/defaults/BatteryStateful_LMOLTO.json
View file
Open in desktop

This file was deleted.

Loading