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

Jump to bottom

Add Concrete TES unit model #100

Merged
merged 9 commits into from
Nov 21, 2022
Merged

Add Concrete TES unit model #100

merged 9 commits into from
Nov 21, 2022

Conversation

radhakrishnatg
Copy link
Contributor

@radhakrishnatg radhakrishnatg commented Apr 15, 2022 •
edited

Addresses issue:

N/A

Summary/Motivation:

#68 is being replaced by this PR.

This PR adds the unit model for concrete thermal energy storage (TES), and a model for supercritical pulverized coal-fired power plant integrated with concrete TES. Concrete TES system is modeled as shown in the figure below:

image

image

Changes proposed in this PR:

  • Added a unit model for concrete thermal energy storage system
  • Added a flowsheet model for supercritical power plant integrated with concrete TES.

Legal Acknowledgement

By contributing to this software project, I agree to the following terms and conditions for my contribution:

  1. I agree my contributions are submitted under the license terms described in the LICENSE.md and COPYRIGHT.md file at the top level of this directory.
  2. I represent I am authorized to make the contributions and grant the license. If my employer has rights to intellectual property that includes these contributions, I represent that I have received permission to make contributions and grant the required license on behalf of that employer.

@radhakrishnatg radhakrishnatg added the Priority:High High Priority Issue or PR label Apr 15, 2022
@radhakrishnatg radhakrishnatg added this to In progress in June 2022 Release via automation Apr 15, 2022
@radhakrishnatg radhakrishnatg self-assigned this Apr 15, 2022
@radhakrishnatg radhakrishnatg changed the title Added the new concrete TES model Existing fossil: SCPC with concrete TES Apr 15, 2022
@codecov
Copy link

codecov bot commented Apr 15, 2022 •
edited

Codecov Report

Base: 94.54% // Head: 93.69% // Decreases project coverage by -0.85% ⚠️

Coverage data is based on head (b3f06fc) compared to base (fcdc05f).
Patch coverage: 88.48% of modified lines in pull request are covered.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #100      +/-   ##
==========================================
- Coverage   94.54%   93.69%   -0.86%     
==========================================
  Files          55       59       +4     
  Lines        6107     7105     +998     
==========================================
+ Hits         5774     6657     +883     
- Misses        333      448     +115
Impacted Files Coverage Δ
...se/supercritical_plant/supercritical_powerplant.py 83.24% <83.24%> (ø)
dispatches/unit_models/tests/test_concrete_tes.py 83.53% <83.53%> (ø)
dispatches/unit_models/concrete_tes.py 96.08% <96.08%> (ø)
...e/supercritical_plant/tests/test_scpc_flowsheet.py 100.00% <100.00%> (ø)
dispatches/unit_models/__init__.py 100.00% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@radhakrishnatg radhakrishnatg mentioned this pull request Apr 15, 2022
Closed
@radhakrishnatg radhakrishnatg marked this pull request as draft April 15, 2022 14:45
@ksbeattie ksbeattie removed this from In progress in June 2022 Release Jun 6, 2022
@radhakrishnatg radhakrishnatg changed the title Existing fossil: SCPC with concrete TES Add Concrete TES unit model Sep 12, 2022
@radhakrishnatg radhakrishnatg mentioned this pull request Oct 2, 2022
Closed
16 tasks
@radhakrishnatg radhakrishnatg marked this pull request as ready for review October 13, 2022 15:47
@radhakrishnatg
Copy link
Contributor Author

@nareshsusarla @esrawli @jghouse88 Could you please review this PR when you have some time? Thank you!

@ksbeattie
Copy link
Contributor

@nareshsusarla will review this PR this week.

nareshsusarla
nareshsusarla approved these changes Nov 18, 2022
View reviewed changes
Copy link
Contributor

@nareshsusarla nareshsusarla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only minor comments rest looks good

dispatches/unit_models/concrete_tes.py
face_area = data["face_area"]
a = data["tube_diameter"] / 2 # Inner radius of the concrete block
b = sqrt(face_area / Constants.pi + a ** 2) # Outer radius
k_red = 0.8 # Reduction factor for thermal conductivity
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a reference for the value, if there is one, else if it is just an assumption then you can state that.

dispatches/unit_models/concrete_tes.py
b = sqrt(face_area / Constants.pi + a ** 2) # Outer radius
k_red = 0.8 # Reduction factor for thermal conductivity
k = data["therm_cond_concrete"] * k_red
correction_factor = 1.31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as above for k_red

@adowling2
Copy link
Contributor

Ready to merge.

@adowling2 adowling2 merged commit edba882 into gmlc-dispatches:main Nov 21, 2022
dguittet added a commit to dguittet/dispatches that referenced this pull request Feb 6, 2023
@dguittet
Squashed commit of the following:
ab9547f 
commit 63c8339
Author: Ludovico Bianchi <lbianchi@lbl.gov>
Date:   Wed Dec 14 09:29:39 2022 -0600

    Update idaes-pse requirement to 2.0.0bx (gmlc-dispatches#164)

    * Update idaes-pse requirement to 2.0.0b1

    * Fix URL

    * updating the discharge files with subproblem presolve off and changed bounds to turn off fbbt and work with new helm changes to IAPWS

    * updating values in tests for new update to iapws

    * Use 2.0.0b2

    * Remove import of pyomo API through idaes

    * addressing value changes to assert statements in tests due to updated IAPWS and causing test failures

    * Pin addheader version

    Co-authored-by: Naresh Susarla <susarlan@ad.science>

commit bcbaba8
Author: Xinhe Chen <95387042+Xinhe-Chen@users.noreply.github.com>
Date:   Mon Dec 12 13:00:40 2022 -0500

    Documentation for steady-state surrogate (gmlc-dispatches#107)

    * documentation for steady-state surrogates

    * changs in documentation

    * modified documentation file

    * update rst file according to Alex comments in PR

    * fix bugs in the rst file

    * try to fix the problem in tests

    * add jupyter notebook link to the documentaion

    * update the documentation file

    * update the documentation to fix the quotation marks issue

    Co-authored-by: Alex Dowling <alex@dowlinglab.org>

commit edba882
Merge: fcdc05f b3f06fc
Author: Alex Dowling <alex@dowlinglab.org>
Date:   Mon Nov 21 13:54:24 2022 -0500

    Merge pull request gmlc-dispatches#100 from radhakrishnatg/fossil-scpc-concrete-tes

    Add Concrete TES unit model

commit b3f06fc
Merge: 7e24511 fcdc05f
Author: Keith Beattie <ksbeattie@lbl.gov>
Date:   Mon Nov 14 12:28:32 2022 -0800

    Merge branch 'main' into fossil-scpc-concrete-tes

commit fcdc05f
Author: Darice L Guittet <dguittet@nrel.gov>
Date:   Mon Nov 14 12:13:15 2022 -0700

    Update notebook checks (gmlc-dispatches#158)

    * use idaes 2.0

    * update version of idaes check

    * updates from dev call

    * fix tests

    * update ne and fe double loop flowsheets

    * update setup.py to use branch

    * update ne flowsheet

    * update ne notebook

    * update setup.py

    * update FE and NE notebooks

    * update notebook

    * update checks.yml

    * update setup.py

    * update FE bidding horizon

    * update notebook checks

    * remove nbval tag from DoubleLoopOptimization

    * reduce runtime

    Co-authored-by: Keith Beattie <ksbeattie@lbl.gov>

commit 9350088
Author: Naresh <49756992+nareshsusarla@users.noreply.github.com>
Date:   Fri Nov 11 13:34:43 2022 -0500

    Idaes2update (gmlc-dispatches#156)

    * updating bounds on the flow for better convergence with idaes2.0

    * removed unnecessary imports, updated bounds on flow, changed constraint on turbine outlet temperature

    * updated design notebook for convergence and tests

    * adding option to retun a pyomo block with usc model

    * updated the multiperiod model with the new multiperiod class

    * updated nlp model for consistency

    * updated pricetaker notebook and model to work with the new class and integrated storage notebook to reflect changes to the model

    * updated tests for the integrated and multiperiod model to align with the changes to the models for idaes 2 update

    * updating the multiperiod code for running the double loop analysis

    * double loop notebook using the latest multiperiod codes

    * updated prescient options for convergence

    Co-authored-by: Naresh Susarla <susarlan@ad.science>

commit 6b905b1
Author: Darice L Guittet <dguittet@nrel.gov>
Date:   Fri Oct 28 08:04:14 2022 -0600

    Double loop Notebooks compatible w/ idaes 2.0 (gmlc-dispatches#155)

    * use idaes 2.0

    * update version of idaes check

    * updates from dev call

    * fix tests

    * update ne and fe double loop flowsheets

    * update setup.py to use branch

    * update ne flowsheet

    * update ne notebook

    * update setup.py

    * update FE and NE notebooks

    * update notebook

    * update checks.yml

    * update setup.py

    * update FE bidding horizon

commit 2417944
Author: radhakrishnatg <42144353+radhakrishnatg@users.noreply.github.com>
Date:   Tue Oct 25 22:07:54 2022 -0400

    Update the NE flowsheet to use the new `MultiPeriodModel` class in IDAES (gmlc-dispatches#143)

    * Updated the nuclear flowsheet and hydrogen turbine model

    * Updated the multiperiod price-taker design notebook

    * Adding back the default argument for process models

    * Fixed a minor bug in NE flowsheet

    * Modified the tests for the nuclear flowsheet

    * Added more tests for the nuclear flowsheet

    * Removed the fixed design code

    * Updated the upper bound on flow_mol in hturbine property package

    * Updated the upper bound in the nuclear flowsheet

commit 7e24511
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Thu Oct 13 19:59:18 2022 -0400

    Improved test coverage

commit 92e60de
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Thu Oct 13 09:27:29 2022 -0400

    Adding __init__ file to tests

commit d6e18ec
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Wed Oct 12 22:37:26 2022 -0400

    Added SCPC flowsheet model

commit 6bae463
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Tue Oct 11 13:54:30 2022 -0400

    Added header to the test file

commit 66bf796
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Tue Oct 11 12:51:13 2022 -0400

    Updated concrete TES model and added tests

commit 2391151
Merge: 24ef000 04a9deb
Author: radhakrishnatg <42144353+radhakrishnatg@users.noreply.github.com>
Date:   Fri Oct 7 15:25:45 2022 -0400

    Merge branch 'main' into fossil-scpc-concrete-tes

commit 24ef000
Merge: 16635c8 81847cb
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Wed Aug 31 18:14:46 2022 -0400

    Merged main

commit 16635c8
Author: Radhakrishna T G <radhakrishnatg@gmail.com>
Date:   Fri Apr 15 09:59:19 2022 -0400

    Added the new concrete TES model
dguittet added a commit to dguittet/dispatches that referenced this pull request Feb 6, 2023
@dguittet
Squashed commit of the following:
0b0802a 
commit 20001b7
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Jan 26 08:56:15 2023 -0700

    update notebooks

commit 164274f
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Jan 26 08:51:20 2023 -0700

    update notebooks

commit b041701
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Jan 12 11:49:12 2023 -0700

    del

commit a06e233
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Jan 12 11:48:16 2023 -0700

    lfs

commit 6d05d38
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Jan 12 11:46:46 2023 -0700

    fix

commit 0fc7310
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Jan 12 11:45:02 2023 -0700

    delete

commit 21831de
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Jan 12 11:43:43 2023 -0700

    delete

commit 1181f4a
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Jan 12 11:33:24 2023 -0700

    undo weird stuff

commit ea53550
Author: dguittet <dguittet@nrel.gov>
Date:   Wed Jan 11 15:10:32 2023 -0700

    update setup.py to use temp idaes-pse

commit 668807a
Author: dguittet <dguittet@nrel.gov>
Date:   Wed Jan 11 14:05:15 2023 -0700

    fix headers

commit 0c3b168
Author: dguittet <dguittet@nrel.gov>
Date:   Wed Jan 11 13:26:50 2023 -0700

    update generator params

commit 65f283c
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 15:46:13 2023 -0700

    no lfs for Wind_Thermal_Dispatch.csv

commit 7f0a420
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 15:29:38 2023 -0700

    update .gitattributes

commit 3f5be92
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 15:14:54 2023 -0700

    update lfs in CI

commit a232f47
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 15:08:03 2023 -0700

    test

commit 8908f02
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 14:44:39 2023 -0700

    fix notebook check

commit f271e50
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 14:40:11 2023 -0700

    fix tests

commit 247f73a
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 13:58:00 2023 -0700

    add comments

commit be4ae0e
Merge: 3229d4c 67b6d96
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 11:26:40 2023 -0700

    Merge branch 're_surrogate' of https://github.com/dguittet/dispatches into re_surrogate

commit 3229d4c
Merge: 6e9ec19 d44985e
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 11:25:59 2023 -0700

    Merge remote-tracking branch 'upstream/main' into re_surrogate

commit 67b6d96
Merge: d51a2ee 6e9ec19
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 11:24:24 2023 -0700

    Merge branch 're_surrogate' of https://github.com/dguittet/dispatches into re_surrogate

commit d51a2ee
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Jan 10 11:24:00 2023 -0700

    update run_double_loop_PEM

commit d44985e
Author: Ludovico Bianchi <lbianchi@lbl.gov>
Date:   Tue Dec 20 08:46:34 2022 -0600

    1.2.dev0

commit 77076a5
Author: bknueven <30801372+bknueven@users.noreply.github.com>
Date:   Mon Dec 19 15:52:07 2022 -0700

    Retype Generators Correctly (gmlc-dispatches#169)

    * ensuring we see failure on runners now

    * trying to get tests to not timeout

    * use dispatches coordinator

    * update Prescient version

    * adding coordinator

    * trying to set cbc options

    * trying with only a single day

commit 6e9ec19
Author: dguittet <dguittet@nrel.gov>
Date:   Mon Dec 19 11:40:55 2022 -0700

    update results comparison

commit 2aea508
Author: dguittet <dguittet@nrel.gov>
Date:   Mon Dec 19 11:39:59 2022 -0700

    update surrogate_validation

commit 63bc59c
Author: Ludovico Bianchi <lbianchi@lbl.gov>
Date:   Fri Dec 16 17:30:12 2022 -0600

    Add CI workflow to test RAVEN integration (gmlc-dispatches#157)

    * Add RAVEN requirement in dedicated file

    * Add first version of CI workflow to test RAVEN

    * Disable other CI workflows while debugging

    * Add CI trigger for RAVEN workflow

    * Fix optional step

    * Fix pip command

    * Download full RAVEN repository to run examples

    * Add shell options to exit at first error

    * Use noninteractive RAVEN workflow for testing

    * Install IDAES solvers

    * Add step for testing TEAL with Pyomo

    * Add requirement for TEAL

    * Add version and platform constraints

    * Tweak initial pip install command

    * Use separate job for testing TEAL

    * Try using dedicated step to set up PATH to enable ipopt without IDAES

    * Use imports needed by DISPATCHES for RAVEN/TEAL Python import checks

    * Only test imports if RAVEN is supported

    * Use ravenframework imports suggested in review comment

    * Update version for raven-framework requirement

    * Make CI job names less redundant

    * Restore triggers for all CI workflows

commit b7b4d80
Author: dguittet <dguittet@nrel.gov>
Date:   Fri Dec 16 13:24:09 2022 -0700

    update double loop

commit 25d3387
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Dec 15 12:30:22 2022 -0700

    add SurrogateValidation.ipynb

commit 8c24da7
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Dec 15 12:04:00 2022 -0700

    update run_double_loop_PEM

commit 933ee0b
Merge: c390544 86d2201
Author: dguittet <dguittet@nrel.gov>
Date:   Wed Dec 14 11:36:35 2022 -0700

    Merge branch 're_surrogate' of https://github.com/dguittet/dispatches into re_surrogate

commit c390544
Author: dguittet <dguittet@nrel.gov>
Date:   Wed Dec 14 11:36:28 2022 -0700

    update surrogate model

commit 86d2201
Author: dguittet <dguittet@nrel.gov>
Date:   Wed Dec 14 11:33:33 2022 -0700

    update DL runner

commit c66c9d5
Merge: 22a79a2 63c8339
Author: dguittet <dguittet@nrel.gov>
Date:   Wed Dec 14 10:09:56 2022 -0700

    Merge remote-tracking branch 'upstream/main' into re_surrogate

commit 63c8339
Author: Ludovico Bianchi <lbianchi@lbl.gov>
Date:   Wed Dec 14 09:29:39 2022 -0600

    Update idaes-pse requirement to 2.0.0bx (gmlc-dispatches#164)

    * Update idaes-pse requirement to 2.0.0b1

    * Fix URL

    * updating the discharge files with subproblem presolve off and changed bounds to turn off fbbt and work with new helm changes to IAPWS

    * updating values in tests for new update to iapws

    * Use 2.0.0b2

    * Remove import of pyomo API through idaes

    * addressing value changes to assert statements in tests due to updated IAPWS and causing test failures

    * Pin addheader version

    Co-authored-by: Naresh Susarla <susarlan@ad.science>

commit bcbaba8
Author: Xinhe Chen <95387042+Xinhe-Chen@users.noreply.github.com>
Date:   Mon Dec 12 13:00:40 2022 -0500

    Documentation for steady-state surrogate (gmlc-dispatches#107)

    * documentation for steady-state surrogates

    * changs in documentation

    * modified documentation file

    * update rst file according to Alex comments in PR

    * fix bugs in the rst file

    * try to fix the problem in tests

    * add jupyter notebook link to the documentaion

    * update the documentation file

    * update the documentation to fix the quotation marks issue

    Co-authored-by: Alex Dowling <alex@dowlinglab.org>

commit edba882
Merge: fcdc05f b3f06fc
Author: Alex Dowling <alex@dowlinglab.org>
Date:   Mon Nov 21 13:54:24 2022 -0500

    Merge pull request gmlc-dispatches#100 from radhakrishnatg/fossil-scpc-concrete-tes

    Add Concrete TES unit model

commit 22a79a2
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Nov 17 11:23:53 2022 -0700

    update

commit 3d4106c
Author: dguittet <dguittet@nrel.gov>
Date:   Thu Nov 17 11:18:52 2022 -0700

    update RE_surrogate_optimization

commit a6e1618
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Nov 15 17:36:55 2022 -0700

    fix pem bid

commit 4f51d9a
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Nov 15 10:11:06 2022 -0700

    Revert "remove LFS"

    This reverts commit b96d25c.

commit b96d25c
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Nov 15 10:11:06 2022 -0700

    remove LFS

commit 0bb2874
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Nov 15 10:06:51 2022 -0700

    add wind_PEM_double_loop

commit 1210763
Merge: a7d3241 fcdc05f
Author: dguittet <dguittet@nrel.gov>
Date:   Tue Nov 15 08:42:43 2022 -0700

    Merge remote-tracking branch 'upstream/main' into re_surrogate

commit a7d3241
Author: dguittet <dguittet@nrel.gov>
Date:   Mon Nov 14 15:37:23 2022 -0700

    fix wind size for opt

commit bd81567
Author: dguittet <dguittet@nrel.gov>
Date:   Mon Nov 14 14:57:11 2022 -0700

    RE_surrogate_optimization working

commit e6b7ad8
Author: dguittet <dguittet@nrel.gov>
Date:   Mon Nov 14 14:54:35 2022 -0700

    RE surrogate running

commit b3f06fc
Merge: 7e24511 fcdc05f
Author: Keith Beattie <ksbeattie@lbl.gov>
Date:   Mon Nov 14 12:28:32 2022 -0800

    Merge branch 'main' into fossil-scpc-concrete-tes

commit fcdc05f
Author: Darice L Guittet <dguittet@nrel.gov>
Date:   Mon Nov 14 12:13:15 2022 -0700

    Update notebook checks (gmlc-dispatches#158)

    * use idaes 2.0

    * update version of idaes check

    * updates from dev call

    * fix tests

    * update ne and fe double loop flowsheets

    * update setup.py to use branch

    * update ne flowsheet

    * update ne notebook

    * update setup.py

    * update FE and NE notebooks

    * update notebook

    * update checks.yml

    * update setup.py

    * update FE bidding horizon

    * update notebook checks

    * remove nbval tag from DoubleLoopOptimization

    * reduce runtime

    Co-authored-by: Keith Beattie <ksbeattie@lbl.gov>

commit fc9be7a
Author: dguittet <dguittet@nrel.gov>
Date:   Sun Nov 13 18:53:37 2022 -0700

    update

commit 876ccc5
Merge: d69db46 2417944
Author: dguittet <dguittet@nrel.gov>
Date:   Fri Nov 11 12:00:39 2022 -0700

    Merge branch 'main' into re_surrogate

commit 9350088
Author: Naresh <49756992+nareshsusarla@users.noreply.github.com>
Date:   Fri Nov 11 13:34:43 2022 -0500

    Idaes2update (gmlc-dispatches#156)

    * updating bounds on the flow for better convergence with idaes2.0

    * removed unnecessary imports, updated bounds on flow, changed constraint on turbine outlet temperature

    * updated design notebook for convergence and tests

    * adding option to retun a pyomo block with usc model

    * updated the multiperiod model with the new multiperiod class

    * updated nlp model for consistency

    * updated pricetaker notebook and model to work with the new class and integrated storage notebook to reflect changes to the model

    * updated tests for the integrated and multiperiod model to align with the changes to the models for idaes 2 update

    * updating the multiperiod code for running the double loop analysis

    * double loop notebook using the latest multiperiod codes

    * updated prescient options for convergence

    Co-authored-by: Naresh Susarla <susarlan@ad.science>

commit d69db46
Author: dguittet <dguittet@nrel.gov>
Date:   Fri Nov 11 11:31:48 2022 -0700

    add re surrogate

commit 6b905b1
Author: Darice L Guittet <dguittet@nrel.gov>
Date:   Fri Oct 28 08:04:14 2022 -0600

    Double loop Notebooks compatible w/ idaes 2.0 (gmlc-dispatches#155)

    * use idaes 2.0

    * update version of idaes check

    * updates from dev call

    * fix tests

    * update ne and fe double loop flowsheets

    * update setup.py to use branch

    * update ne flowsheet

    * update ne notebook

    * update setup.py

    * update FE and NE notebooks

    * update notebook

    * update checks.yml

    * update setup.py

    * update FE bidding horizon

commit 2417944
Author: radhakrishnatg <42144353+radhakrishnatg@users.noreply.github.com>
Date:   Tue Oct 25 22:07:54 2022 -0400

    Update the NE flowsheet to use the new `MultiPeriodModel` class in IDAES (gmlc-dispatches#143)

    * Updated the nuclear flowsheet and hydrogen turbine model

    * Updated the multiperiod price-taker design notebook

    * Adding back the default argument for process models

    * Fixed a minor bug in NE flowsheet

    * Modified the tests for the nuclear flowsheet

    * Added more tests for the nuclear flowsheet

    * Removed the fixed design code

    * Updated the upper bound on flow_mol in hturbine property package

    * Updated the upper bound in the nuclear flowsheet

commit 7e24511
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Thu Oct 13 19:59:18 2022 -0400

    Improved test coverage

commit 92e60de
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Thu Oct 13 09:27:29 2022 -0400

    Adding __init__ file to tests

commit d6e18ec
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Wed Oct 12 22:37:26 2022 -0400

    Added SCPC flowsheet model

commit 6bae463
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Tue Oct 11 13:54:30 2022 -0400

    Added header to the test file

commit 66bf796
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Tue Oct 11 12:51:13 2022 -0400

    Updated concrete TES model and added tests

commit 2391151
Merge: 24ef000 04a9deb
Author: radhakrishnatg <42144353+radhakrishnatg@users.noreply.github.com>
Date:   Fri Oct 7 15:25:45 2022 -0400

    Merge branch 'main' into fossil-scpc-concrete-tes

commit 0dadc95
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Sun Oct 2 23:34:31 2022 -0400

    automation workflow

commit 3d7555d
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Sun Oct 2 15:45:46 2022 -0400

    fix num_sims bug

commit db21ed8
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Sun Oct 2 15:13:00 2022 -0400

    fix an issue from .gitignore that ignores the clustering result path

commit 687f26b
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Sun Oct 2 14:57:44 2022 -0400

    fix saving clustering model path errors

commit 3563631
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Sun Oct 2 14:46:49 2022 -0400

    fix num_clusters bugs in TimeSeriesClustering

commit 349a895
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Sun Oct 2 14:13:54 2022 -0400

    fix file path issue

commit 5cd443e
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Fri Sep 30 16:34:13 2022 -0400

    fix bugs

commit 79f8ed1
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Fri Sep 30 16:22:56 2022 -0400

    update main function to test on CRC

commit 64db797
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Fri Sep 30 16:10:36 2022 -0400

    update comments and docstings

commit 3f87592
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Fri Sep 30 15:51:15 2022 -0400

    update the automation workflow using composition and fix indent problem

commit 5d18f41
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Thu Sep 29 10:19:30 2022 -0400

    Automation workflow prototype

commit 71ec2b0
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Tue Sep 27 22:38:35 2022 -0400

    update automation workflow, successfully in TrainNN.

commit 9f028a6
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Wed Sep 21 22:02:29 2022 -0400

    progress on automation

commit b3be37a
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Thu Sep 15 13:56:16 2022 -0400

    try to build automation workflow

commit 5b676a7
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Sep 12 22:53:14 2022 -0400

    3 try add lmp.csv using lfs

commit 1e95d24
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Sep 12 21:02:08 2022 -0400

    try to add lmp.csv as large file

commit 9ee5236
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Sep 12 20:51:42 2022 -0400

    remove lmp.csv

commit 78a0fd1
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Sep 12 20:47:35 2022 -0400

    lfs track LMP.csv

commit e2f0ec4
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Sep 12 20:44:12 2022 -0400

    reorganize repo, update readme

commit 99025ed
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Sep 12 15:20:24 2022 -0400

    add notebook for analyze clustering results

commit 4216833
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Sat Sep 3 15:03:08 2022 -0400

    analysis of wind pv dispatch data

commit 14b8327
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Thu Sep 1 09:54:38 2022 -0400

    more updates

commit ea2da76
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Wed Aug 31 18:34:53 2022 -0400

    updates

commit 24ef000
Merge: 16635c8 81847cb
Author: Radhakrishna <radhakrishnatg@gmail.com>
Date:   Wed Aug 31 18:14:46 2022 -0400

    Merged main

commit 16fc78e
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Wed Aug 31 10:30:02 2022 -0400

    add placeholder for saved Keras models

commit b649250
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Wed Aug 31 10:23:33 2022 -0400

    solve errors in clustering and rerun optimization

commit f10209e
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Tue Aug 30 17:32:03 2022 -0400

    fix clustering codes error: errors in counting the number of full capacity days

commit 08d2664
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Aug 29 21:15:28 2022 -0400

    updates on surrogates

commit a3e7c38
Merge: d613f9f 81847cb
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Fri Aug 26 15:33:28 2022 -0400

    Merge branch 'main' of https://github.com/gmlc-dispatches/dispatches into dynamic_surrogates

commit d613f9f
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Fri Aug 26 15:25:33 2022 -0400

    build model with all surrogates

commit 33ac11d
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Jul 25 15:11:51 2022 -0400

    Update on the dynamic conceptual surrogates, detailed log is in the readme.txt

commit 000b0ad
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Fri Jul 22 15:22:22 2022 -0400

    solved infeasibility problem for only rev and fixed ws

commit 01ba7ff
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Thu Jul 21 16:11:46 2022 -0400

    add sigmoid activations NN models

commit 04248a6
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Thu Jul 21 14:49:18 2022 -0400

    first runnable version but need to change the parameters as scaled

commit d396ddd
Merge: f8eff91 5760166
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Thu Jul 21 11:04:03 2022 -0400

    Merge branch 'main' into dynamic_surrogates

commit f8eff91
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Thu Jul 21 10:53:17 2022 -0400

    use keras and omlt v1.0

commit bde9e8e
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Fri Jul 15 14:57:58 2022 -0400

    add keras NN surrogate

commit 14e89d7
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Thu Jul 14 13:59:43 2022 -0400

    fix the package import bugs

commit c98ca0c
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Thu Jul 14 11:26:03 2022 -0400

    First version of dynamic conceptual design RE case without testing

commit dd16988
Merge: 3dcb821 a9e9de2
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Jun 27 11:02:00 2022 -0400

    Merge branch 'dynamic_surrogates' of https://github.com/Xinhe-Chen/dispatches into dynamic_surrogates

commit 3dcb821
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Jun 27 11:01:32 2022 -0400

    exclude small csv files from lfs

commit a9e9de2
Merge: a6f5b81 a8cd6b1
Author: Xinhe Chen <95387042+Xinhe-Chen@users.noreply.github.com>
Date:   Mon Jun 27 10:53:23 2022 -0400

    Merge branch 'main' into dynamic_surrogates

commit a6f5b81
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Jun 27 10:30:01 2022 -0400

    upload large csv file

commit 24b6904
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon Jun 27 10:14:55 2022 -0400

    do not upload the csv files

commit 841ef1f
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Sun Jun 26 16:59:00 2022 -0400

    add big csv by git lfs

commit 3fc5181
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Sun Jun 26 15:27:58 2022 -0400

    delete unnecessary previous files and add TSA-NN surrogate based on shuffled data

commit ad6cac5
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon May 30 22:34:55 2022 -0400

    Add fix random state for clustering and improve the notebook for box plots

commit d42e35c
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Mon May 30 22:33:54 2022 -0400

    draft codes for dynamic conceptual design problem

commit 9235eb9
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Tue May 17 14:32:12 2022 -0400

    Add the mean, median, standard dev for the cluster with most points

commit eafd275
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Tue May 17 13:37:21 2022 -0400

    Modify the notebook to make it more clear

commit 3b47b78
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Tue May 17 13:15:51 2022 -0400

    Add box plots to the jupyter note book

commit 78f0377
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Thu May 5 23:55:12 2022 -0400

    Added only do clustering on dispatch and filter the extreme points cases

commit ea1d1d7
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Tue Apr 26 12:52:05 2022 -0400

    updated noteboook for visualization

commit eede70f
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Wed Apr 20 12:02:47 2022 -0400

    first test result of tslearn package

commit 16635c8
Author: Radhakrishna T G <radhakrishnatg@gmail.com>
Date:   Fri Apr 15 09:59:19 2022 -0400

    Added the new concrete TES model

commit 393b018
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Tue Apr 5 21:04:38 2022 -0400

    Extract data from 64K simulations.

commit 8294b5b
Merge: d614b6b cdd5e62
Author: Xinhe Chen <95387042+Xinhe-Chen@users.noreply.github.com>
Date:   Tue Apr 5 14:54:54 2022 -0400

    Merge branch 'main' into dynamic_surrogates

commit d614b6b
Author: Xinhe Chen <xchen24@nd.edu>
Date:   Tue Apr 5 14:49:51 2022 -0400

    Create Readme.txt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nareshsusarla nareshsusarla nareshsusarla approved these changes

@esrawli esrawli esrawli approved these changes

@jghouse88 jghouse88 Awaiting requested review from jghouse88

Assignees

@radhakrishnatg radhakrishnatg

Labels
Priority:High High Priority Issue or PR
Projects
No open projects
Dec 2022 Release
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@radhakrishnatg @ksbeattie @adowling2 @nareshsusarla @esrawli @Andresj89