-
Notifications
You must be signed in to change notification settings - Fork 114
Add two new sco2 configurations #1353
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
Merged
Merged
Changes from 99 commits
Commits
Show all changes
104 commits
Select commit
Hold shift + click to select a range
337a4b2
Add sco2 htr bypass clas to tcs project
taylorbrown75 930f80e
Add blank functions to htr bypass. Begin adding call from pc_csp_int
taylorbrown75 6d4f3da
Merge with online repository
taylorbrown75 254d001
Merge in bug fix for sco2
taylorbrown75 3856878
Add methods for solving htr bypass cycle. Add temporary code to cmod …
taylorbrown75 a4bb6a2
Fix bug in htr bypass solver
taylorbrown75 e8ffc4a
Change target cold approach temperature to PHX (instead of Bypass)
taylorbrown75 aaa879e
Fix bug to make htr bypass callable from python
taylorbrown75 49ce724
Transition solvers to shared monotonic equation class. Modify inputs …
taylorbrown75 d2f248d
Add additional bypass variables to cmod. Pass through to htr bypass m…
taylorbrown75 145a66e
Solve with PHX cold approach rather than Bypass cold approach
taylorbrown75 2e02898
Update branch to latest develop
taylorbrown75 1a51ca1
Integrate htr bypass cycle into upstream logic. Add bypass heat excha…
taylorbrown75 c0df2aa
Try modifying htr bypass optimizer to prevent crashes
taylorbrown75 675a055
Change bypass fraction optimization to non linear. Add penalty to cyc…
taylorbrown75 a3a74ed
Add alfani test case
taylorbrown75 98ca56e
Add HX model definitions to end of cycle simulation. Add debug code f…
taylorbrown75 1b69153
Add air cooler calculations (W and Q). Begin updating debug output st…
taylorbrown75 410f2b8
Add variables to debug output string
taylorbrown75 30a9907
Add bypass fraction to cmod. Add htr bypass outputs to cmod.
taylorbrown75 5201861
Add option to hard set HTF mass flow rate for HTR Bypass configuration.
taylorbrown75 f12628c
Ensure that HTR optimization sets the optimal values.
taylorbrown75 04a6153
Add cmod outputs. Fix bug with recomp_frac = 0 in htr bypass cycle
taylorbrown75 65d2930
Fix output when bypass heat exchanger has zero flow
taylorbrown75 f971152
Catch air cooler sizing exceptions. Add max evaluation limit to optim…
taylorbrown75 f309670
Change T_htf_cold_des to HTF outlet temperature (not necessarily PHX …
taylorbrown75 b18ecfc
Begin adding option to optimize for bypass fraction outside of main o…
taylorbrown75 a4ae653
Add optimization routine to optimize bypass fraction outside other va…
taylorbrown75 3078fa5
Use user defined tolerance, rather than hardcode.
taylorbrown75 89e6d80
Try adding max evaluation limit
taylorbrown75 bb7ef44
Add ability to target low sco2 temperature
taylorbrown75 2bbd64b
Add cmod to calculate sco2 plotting values
taylorbrown75 c359ef6
Add sco2_helper cmod to correct folder
taylorbrown75 f1f44c4
Begin creating stand alone htr bp design point model
taylorbrown75 150916f
Complete core simulation model
taylorbrown75 e1ba650
Move core simulation results to dedicated outputs class
taylorbrown75 89c1877
Add basic optimization functionality
taylorbrown75 fe5164a
Add comments and reorganize to plan optimization return values.
taylorbrown75 d8a37c9
Change function parameters to references and const where possible.
taylorbrown75 4fef9eb
Pass htrbp core solve class to optimizer, rather than inputs only.
taylorbrown75 2dba891
Add finalize design function. Rename optimization function
taylorbrown75 01f7da0
Remove old optimization routines and unused functions.
taylorbrown75 8fe848d
Reorganize code. Add initialization to htf inputs.
taylorbrown75 c24621d
Clean auto_opt_design_core
taylorbrown75 28cec8c
Begin adding total UA optimization
taylorbrown75 dc5fdcd
Complete total UA optimization. Remove unnecessary class.
taylorbrown75 8950685
Remove duplicate fields from ms_opt_des_par. Initialize variables.
taylorbrown75 382d6c7
Structure code. Synchronize naming convention. Add error check. Remov…
taylorbrown75 4ca0167
Make eta_thermal_target constant. Rename initialization function.
taylorbrown75 67cb2ce
Add message to report iterations out
taylorbrown75 794115a
Add turbine split flow cycle files (not complete).
taylorbrown75 a3e3ddd
Add tsf specific inputs to cmod and shared classes. Rename core tsf m…
taylorbrown75 13c86e8
Add tsf specific parameters to tsf class. Handle variable exchange fr…
taylorbrown75 19048fc
Develop tsf design point up to HTR mono opt.
taylorbrown75 e65a1ae
Complete TSF core model.
taylorbrown75 3563f61
Add tolerance to error check.
taylorbrown75 a3f5d2a
Add optimization for design_method == 2 or 3
taylorbrown75 70799cf
Update plotting functions for Turbine split flow. Cmod not complete.
taylorbrown75 cda42dd
Complete cmod for TSF.
taylorbrown75 c7bf852
Add missing t2 PH data
taylorbrown75 5f18142
Add monotonic solver for HTR. Fix Solve_HTR
taylorbrown75 046cbe8
Add error code to cmod. Allows cycle to fail and pass error out.
taylorbrown75 0dec486
Merge branch 'develop' into sco2_tsf
taylorbrown75 9f52a66
Add option to end simulation if efficiency is below cutoff.
taylorbrown75 9886104
Fix bug returning error code in recomp.
taylorbrown75 9f9ad62
Fix HX q_dot guess bug.
taylorbrown75 21fdb7d
Update cycle_config label to include tsf.
taylorbrown75 611b153
Update air cooler solver to account for large temperature differences.
taylorbrown75 34d5270
Fix bug preventing users from setting recomp frac to zero in partial …
taylorbrown75 b239525
Add high temperature correction to recuperator cost model.
taylorbrown75 b855cbe
Fix recuperator temperature correction bug.
taylorbrown75 7f27795
change exception to fix linus build
tyneises 71b2701
Add temperature correction to turbine cost.
taylorbrown75 c18e306
Merge branch 'sco2_tsf' of https://github.com/nrel/ssc into sco2_tsf
taylorbrown75 5ae2e7d
remove class name from method to try to resolve linux error
tyneises 4c53d26
Merge branch 'sco2_tsf' of https://github.com/nrel/ssc into sco2_tsf
tyneises 9da26ff
remove class name from method to try to resolve linux error
tyneises 2586338
remove maxeval from sco2 cycle optimization
tyneises 3671fa7
Add inflation factor input.
taylorbrown75 5fb7300
update sco2 test results for new sco2 cost correlations
tyneises 3e25329
Change inflation factor input to inflation year.
taylorbrown75 d9e0181
Merge branch 'sco2_tsf' of https://github.com/nrel/ssc into sco2_tsf
taylorbrown75 1e7700f
Change inflation factor input to inflation year.
taylorbrown75 d063857
Merge branch 'develop' into sco2_tsf
tyneises 1effbcf
update function calls with inflation year that was required after bra…
tyneises 23fed72
Merge branch 'develop' into sco2_tsf
taylorbrown75 0ec0747
Remove sco2 helper cmod.
taylorbrown75 cd8f24d
Modify htr bypass vartable inputs.
taylorbrown75 9ba8a1d
Add turbine split frac to cmod outputs.
taylorbrown75 f53d9c7
Remove debug code.
taylorbrown75 075cb64
Add unsupported error ENUM.
taylorbrown75 b04ddf0
Modify exception definition to fix Mac bug.
taylorbrown75 1ae2933
Revert "Modify exception definition to fix Mac bug."
taylorbrown75 5e2c5d0
Add check for off design unsupported configs.
taylorbrown75 be2bd76
Throw error instead of passing through vartable. Add sco2 tests.
taylorbrown75 f5bf2f8
Add sco2 tests.
taylorbrown75 a02451d
Update sco2 tolerance for tests.
taylorbrown75 a7414fe
Fix bug with reported mc mdot for TSF.
taylorbrown75 52843d3
Remove error_int check from vartable outputs.
taylorbrown75 52f458e
Merge branch 'develop' into sco2_tsf
taylorbrown75 11a6f1e
Replace hardcoded inflation year with variable.
taylorbrown75 1605250
Fix tsf comment.
taylorbrown75 4350dc0
Remove unnecessary semi colons
taylorbrown75 1e7fc7d
Fix inflation year bug.
taylorbrown75 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.