-
Notifications
You must be signed in to change notification settings - Fork 10
MGA updates & employment outputs #21
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
Open
atpham88
wants to merge
87
commits into
main
Choose a base branch
from
ap_MGA
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
87 commits
Select commit
Hold shift + click to select a range
b91d8e0
move files to github.com
atpham88 261d0f4
use gentech as MGA subobjective instead of all techs
atpham88 0149846
resolve conflicts
atpham88 c980617
Update user_guide.md
atpham88 54fac41
resolve conflicts
atpham88 864ec0e
Merge branch 'main' into ap_MGA
atpham88 4edc116
clean up
atpham88 145d3c2
remove all cap MGA max/min option
atpham88 6f8216b
add gentech to i_subtech set
atpham88 ffd3c6f
resolve to pass github tests
atpham88 255c39f
Update futurefiles.csv
atpham88 76a989d
Merge branch 'main' into ap_MGA
atpham88 ab732e8
reduce number of employment output files
atpham88 ea35ef8
consolidate employment output files
atpham88 a010fcc
clean up
atpham88 de30597
clean up
atpham88 98f2e43
fix construction job-years calculation
atpham88 13224b8
no longer need encoding when writing log file
atpham88 111be85
Merge branch 'main' into ap_MGA
atpham88 a827879
revert changes
atpham88 61e2c5d
revert changes
atpham88 3e52966
Update log.py
atpham88 f16ae47
Merge branch 'main' into ap_MGA
atpham88 5491799
add mga cplex settings
atpham88 f1ac23a
Merge branch 'main' into ap_MGA
atpham88 76c0541
resolve conflicts
atpham88 4569a26
Merge branch 'main' into ap_MGA
atpham88 0249828
resolve conflicts
atpham88 ac4f013
reformat transmission employment factor data file
atpham88 2c78ed4
clean up
atpham88 35820e5
clean up
atpham88 56d7b61
clean up
atpham88 5127943
Update reeds/core/terminus/report_params.csv
atpham88 76afa5c
Update reeds/core/terminus/report_params.csv
atpham88 0927849
Update reeds/core/setup/d_mga.gms
atpham88 e9f1d89
Update reeds/core/setup/d_mga.gms
atpham88 4d91aa2
Update reeds/core/setup/d_mga.gms
atpham88 b9a93b9
Merge branch 'main' into ap_MGA
atpham88 9bba8b6
clean up
atpham88 b673d8d
clean up and add USA fast MGA test case
atpham88 1ecb9ae
Update reeds/core/setup/d_mga.gms
atpham88 1da0427
Update d_mga.gms
atpham88 fe0fa44
Merge branch 'main' into ap_MGA
atpham88 9839c46
Merge branch 'main' into ap_MGA
atpham88 06521bd
clean up
atpham88 e9893bc
Merge branch 'main' into ap_MGA
atpham88 06b1575
clean up and check employment calculation
atpham88 76bc46d
use cost ratio to adjust employment factors for upgrade techs
atpham88 e801f34
clean up
atpham88 651d50e
calculate transmission fom employment as construction employment x tr…
atpham88 aea0c4d
clean up
atpham88 7bd71c0
update transmission fom employment in report.gms + clean up
atpham88 025f13c
Merge branch 'main' into ap_MGA
atpham88 b8135fc
Merge branch 'main' into ap_MGA
atpham88 f0e2e9c
Merge branch 'main' into ap_MGA
atpham88 e097212
add documentation for JEDI/WIRED employment factors
atpham88 96c3ea5
Update references.bib
atpham88 5d01b36
update VOM EFs
atpham88 0b64fde
Update docs/source/model_documentation.md
atpham88 58ed894
remove employment_factor_inter_transmission.csv from runfiles.csv
atpham88 aeba6ec
Update reeds/input_processing/copy_files.py
atpham88 aeb4a27
remove FOM & VOM EF from transmission employment factor
atpham88 d149427
Merge branch 'ap_MGA' of https://github.com/ReEDS-Model/ReEDS into ap…
atpham88 dbe0b48
Update reeds/core/setup/b_inputs.gms
atpham88 de30412
Update reeds/core/setup/b_inputs.gms
atpham88 3e61db2
Update reeds/core/setup/b_inputs.gms
atpham88 fbf954e
remove alternative way to estimate transmission FOM employment
atpham88 55dde5e
Merge branch 'ap_MGA' of https://github.com/ReEDS-Model/ReEDS into ap…
atpham88 d693897
add new line back at end
atpham88 4d255e6
remove USA_MGA_fast test
atpham88 af0b40d
clean up EF unit
atpham88 3d77c80
add README for employment
atpham88 9113aeb
incorporate citations from zotero
atpham88 3cedf18
Update README.md
atpham88 b049e4b
Update README.md
atpham88 d6f27fd
Update README.md
atpham88 16446e3
Update README.md
atpham88 2288092
Update README.md
atpham88 12e89b4
fix citation links
atpham88 4ebc693
fix citation links
atpham88 772b5d7
Merge branch 'main' into ap_MGA
atpham88 376989c
update transmission FOM employment
atpham88 65ef0d0
Update reeds/core/terminus/report.gms
atpham88 ecf5b23
clean up
atpham88 62174c2
Update report.gms
atpham88 5b10793
Update report.gms
atpham88 3b78b93
fix minor issues
atpham88 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
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
|
atpham88 marked this conversation as resolved.
|
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.