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

HERON submod update #1808

Merged
merged 2 commits into from
Apr 15, 2022
Merged

HERON submod update #1808

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa08fbd
HERON submod update
PaulTalbot-INL Apr 12, 2022
b26fc47
Merge remote-tracking branch 'origin/devel' into heron_submod_update
joshua-cogliati-inl Apr 15, 2022
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
2 changes: 1 addition & 1 deletion plugins/HERON
Open in desktop
Submodule HERON updated 62 files
+2 −2 .gitignore
+1 −0 README.md
+14 −6 doc/user_manual/make_docs.bat
+ − doc/workshop/ExampleCases.pptx
+2 −3 heron
+ − logos/Heron_logo.pdf
+176 −185 src/Cases.py
+16 −16 src/Components.py
+1 −1 src/DispatchPlot.py
+1 −3 src/Economics.py
+19 −13 src/Placeholders.py
+6 −3 src/Testers/HeronIntegrationTester.py
+7 −5 src/ValuedParamHandler.py
+2 −2 src/ValuedParams/Factory.py
+2 −2 src/ValuedParams/ValuedParam.py
+22 −11 src/_utils.py
+2 −1 src/base.py
+1 −1 src/dispatch/CustomDispatcher.py
+2 −2 src/dispatch/Dispatcher.py
+4 −2 src/dispatch/pyomo_dispatch.py
+1 −1 src/input_loader.py
+11 −10 src/main.py
+1 −1 src/validators/ExampleValidator.py
+1 −1 src/validators/Validator.py
+7 −6 templates/inner.xml
+4 −3 templates/outer.xml
+202 −44 templates/template_driver.py
+ − tests/integration_tests/ARMA/Sine/arma.pk
+ − tests/integration_tests/ARMA/Sine30yr/arma_30yr.pk
+ − tests/integration_tests/ARMA/Sine_Hour/arma.pk
+ − tests/integration_tests/ROM/linear_rom.pk
+ − tests/integration_tests/mechanics/cashflows/analytic.xlsx
+3 −3 tests/integration_tests/mechanics/cashflows/gold/Runs_o/sweep.csv
+1 −3 tests/integration_tests/mechanics/cashflows/heron_input.xml
+0 −9 tests/integration_tests/mechanics/custom_dispatcher/heron_input.xml
+1 −1 tests/integration_tests/mechanics/debug_mode/heron_input.xml
+3 −3 tests/integration_tests/mechanics/labels/gold/Sweep_Runs_o/sweep.csv
+0 −9 tests/integration_tests/mechanics/labels/heron_input.xml
+0 −1 tests/integration_tests/mechanics/min_demand/heron_input.xml
+1 −7 tests/integration_tests/mechanics/multimarket_fix_price/heron_input.xml
+5 −7 tests/integration_tests/mechanics/multirun_sweep_opt/gold/Runs_o/opt_soln_0.csv
+3 −3 tests/integration_tests/mechanics/multirun_sweep_opt/gold/Runs_o/sweep.csv
+2 −0 tests/integration_tests/mechanics/optimization_settings/gold/Opt_Runs_o/opt_soln.csv
+5 −0 tests/integration_tests/mechanics/optimization_settings/gold/Opt_Runs_o/opt_soln_0.csv
+117 −0 tests/integration_tests/mechanics/optimization_settings/heron_input.xml
+14 −0 tests/integration_tests/mechanics/optimization_settings/tests
+36 −0 tests/integration_tests/mechanics/optimization_settings/transfers.py
+1 −32 tests/integration_tests/mechanics/production_steady/heron_input.xml
+1 −1 tests/integration_tests/mechanics/pyomo_options/heron_input.xml
+1 −1 tests/integration_tests/mechanics/storage_func/heron_input.xml
+1 −1 tests/integration_tests/mechanics/validator/heron_input.xml
+0 −6 tests/integration_tests/mechanics/var_demand_fix_price/heron_input.xml
+0 −6 tests/integration_tests/mechanics/var_demand_var_price/heron_input.xml
+1 −3 tests/integration_tests/workflows/production_flex/heron_input.xml
+6 −16 tests/integration_tests/workflows/production_flex_opt/gold/Opt_Runs_o/opt_soln_0.csv
+4 −33 tests/integration_tests/workflows/production_flex_opt/heron_input.xml
+16 −11 tests/integration_tests/workflows/production_flex_opt/transfers.py
+1 −1 tests/integration_tests/workflows/storage/heron_input.xml
+3 −4 tests/unit_tests/ValuedParams/testParametric.py
+3 −4 tests/unit_tests/testComponent.py
+ − tests/workshop/htse/arma_202112_nyiso_def.pk
+116 −0 tests/workshop/htse/example1_simple/heron_input.xml