Skip to content

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.

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

Open
atpham88 wants to merge 25 commits into
base: main
Choose a base branch
from
Open

MGA updates & employment outputs #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
b91d8e0
move files to github.com
atpham88 Apr 16, 2026
261d0f4
use gentech as MGA subobjective instead of all techs
atpham88 Apr 16, 2026
0149846
resolve conflicts
atpham88 Apr 16, 2026
c980617
Update user_guide.md
atpham88 Apr 16, 2026
54fac41
resolve conflicts
atpham88 Apr 16, 2026
864ec0e
Merge branch 'main' into ap_MGA
atpham88 Apr 16, 2026
4edc116
clean up
atpham88 Apr 16, 2026
145d3c2
remove all cap MGA max/min option
atpham88 Apr 16, 2026
6f8216b
add gentech to i_subtech set
atpham88 Apr 16, 2026
ffd3c6f
resolve to pass github tests
atpham88 Apr 16, 2026
255c39f
Update futurefiles.csv
atpham88 Apr 17, 2026
76a989d
Merge branch 'main' into ap_MGA
atpham88 Apr 26, 2026
ab732e8
reduce number of employment output files
atpham88 Apr 27, 2026
ea35ef8
consolidate employment output files
atpham88 Apr 27, 2026
a010fcc
clean up
atpham88 Apr 27, 2026
de30597
clean up
atpham88 Apr 27, 2026
98f2e43
fix construction job-years calculation
atpham88 Apr 27, 2026
13224b8
no longer need encoding when writing log file
atpham88 Apr 28, 2026
111be85
Merge branch 'main' into ap_MGA
atpham88 May 12, 2026
a827879
revert changes
atpham88 May 12, 2026
61e2c5d
revert changes
atpham88 May 12, 2026
3e52966
Update log.py
atpham88 May 12, 2026
f16ae47
Merge branch 'main' into ap_MGA
atpham88 May 21, 2026
5491799
add mga cplex settings
atpham88 May 21, 2026
f1ac23a
Merge branch 'main' into ap_MGA
atpham88 Jun 5, 2026
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
8 changes: 5 additions & 3 deletions cases.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ GSw_distpv,Turn on/off distpv,0;1,1,
GSw_DRShed, switch to turn on/off demand response shed resource,0;1,0,
GSw_EFS_Flex,Switch for turning EFS load flexibility on or off,0,0,
GSw_EFS2_FlexCase,"Case used for electrification flex_type - format is {1}_{2}, where 1 in [EFS_REFERENCE, EFS_MEDIUM, EFS_HIGH, EFS_Clean2035] and 2 in [Baseflex, Currentflex, Enhancedflex, Uberflex1, Uberflex2]",N/A,EFS_MEDIUM_EnhancedflexStretch2046,
GSw_EmploymentFactor,Employment factor - options to choose from are factor from JEDI model and two papers,JEDI; Mayfield ;Rutovitz ;Ram ,JEDI,
Copy link
Copy Markdown
Contributor

@patrickbrown4 patrickbrown4 Apr 29, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

We haven't formally adopted yet, but from the discussion on #45 we're planning to adopt the regex-style formatting throughout.

(nitpick/optional) Just to make one less thing to remember, could use lower case (same as GSw_OutageScen) (ok to save for a different PR addressing #45 if you prefer)

Suggested change
GSw_EmploymentFactor,Employment factor - options to choose from are factor from JEDI model and two papers,JEDI; Mayfield ;Rutovitz ;Ram ,JEDI,
GSw_EmploymentFactor,Source for employment factor data - see inputs/employment/README.md for descriptions,^(jedi|mayfield|rutovitz|ram)$,jedi,

GSw_EVMC,Turn on adoptable EV managed charging,0; 1,0,
GSw_FakeData,Use fake capacity factor profiles (for TESTING ONLY when you do not want to download the real CF data),^[0-1]$,0,
GSw_ForcePrescription,Turn on/off forced prescriptions - turning off will allow unlimited but not free builds in historical years,0; 1,1,
Expand All @@ -148,7 +149,8 @@ GSw_GenMandate,Turn on/off national Gen Requirement. 2 turns on and applies cons
GSw_GenMandateList,Select technology list for national generation standard (see inputs/national_generation/nat_gen_tech_frac.csv),RE; Nuclear; NuclearCCS,RE,
GSw_GenMandateScen,Select trajectory for national generation standard (see inputs/national_generation/gen_mandate_trajectory.csv),N/A,100_2035,
GSw_Geothermal,"Geothermal can be turned off [0], left to the default representation [1], or have an extended representation [2]",0; 1; 2,1,
GSw_gopt,Select opt file to be used,N/A,1,
GSw_gopt,Select opt file to be used,^[1-4]$,1,
GSw_gopt_mga,Select opt file to be used for MGA runs,^[1-4]$,3,
GSw_GrowthAbsCon,Turn on/off absolute growth constraint,0; 1,0,
GSw_GrowthConLastYear,The last year that the growth constraint (GSw_GrowthAbsCon) is applied (if it is turned on),int,2026,
GSw_GrowthPenalties,Turn on/off relative growth penalties,0; 1,0,
Expand Down Expand Up @@ -219,8 +221,8 @@ GSw_MaxDailyCF,Turn on/off daily maximum capacity factor constraint,0; 1,1,
GSw_MethaneLeakageScen,Fractional leakage of methane from upstream natural gas production: either float (fixed rate) or scenario name from emission_constraints/methane_leakage_rate.csv,N/A,Alvarez2018_30by2030,
GSw_MGA_CostDelta,MGA: Fraction by which to allow objective function to increase when using Modeling to Generate Alternatives (MGA is turned off if set to 0; a common choice for MGA is 0.01),float,0,
GSw_MGA_Direction,MGA: Directionality of second optimization,(min|max),min,
GSw_MGA_Objective,MGA: Objective for MGA (uses GSw_MGA_SubObjective to specify technology subset if set to capacity),(capacity|transmission|rasharing|co2),rasharing,
GSw_MGA_SubObjective,MGA: Technology subset to minimize or maximize the capacity of (only used for GSw_MGA_Objective=capacity),(battery|ccs|coal|dac|fossil|gas|geo|h2_combustion|hydro|nuclear|ofswind|onswind|pv|re|storage|upv|vre|wind),storage,
GSw_MGA_Objective,MGA: Objective for MGA (uses GSw_MGA_SubObjective to specify technology subset if set to capacity),(capacity|generation|transmission|rasharing|co2|employment),capacity,
GSw_MGA_SubObjective,MGA: Technology subset to minimize or maximize the capacity or generation of (only used for GSw_MGA_Objective=(capacity or generation)),(battery|ccs|coal|dac|fossil|gas|gentech|geo|h2_combustion|hydro|nuclear|ofswind|onswind|pv|re|storage|upv|vre|wind),gentech,
GSw_MinCF,Turn on/off regional min CF constraint (applied at i/r level),0; 1,1,
GSw_Mingen,Turn on/off min-gen constraints by r/h/szn,0; 1,0,
GSw_MingenFixed,Turn on/off fixed min-gen constraints,0; 1,1,
Expand Down
4 changes: 2 additions & 2 deletions docs/source/user_guide.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,8 +625,8 @@ MGA is turned off if set to 0; a reasonable choice for MGA is in the range of 0.
- `GSw_MGA_Direction` (default `min`): Directionality of the second optimization.
Options are `min` or `max`.
- `GSw_MGA_Objective` (default `capacity`): Objective for MGA (uses `GSw_MGA_SubObjective` to specify technology subset if set to `capacity`).
Options are `capacity`, `transmission`, `rasharing`, and `co2`.
- `GSw_MGA_SubObjective` (default `fossil`): Technology subset to minimize or maximize the capacity of (only used for `GSw_MGA_Objective = capacity`).
Options are `capacity`, `generation`, `transmission`, `rasharing`, and `co2`.
- `GSw_MGA_SubObjective` (default `gentech`): Technology subset to minimize or maximize the capacity of (only used for `GSw_MGA_Objective = (capacity or generation)`).
Options are the column names in the `inputs/tech-subset-table.csv` file.

Users familiar with GAMS can add alternative objective functions to the `d_mga.gms` file and associated options to the `GSw_MGA_Objective` switch in `cases.csv`.
Expand Down
3 changes: 3 additions & 0 deletions inputs/employment/employment_factor_inter_transmission.csv
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@patrickbrown4 patrickbrown4 Apr 29, 2026

Choose a reason for hiding this comment

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

Can you add an inputs/employment/README.md file describing the sources (with links) and explicit units for each of the files in this folder?

Copy link
Copy Markdown
Contributor

@patrickbrown4 patrickbrown4 Apr 30, 2026

Choose a reason for hiding this comment

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

We should also add a section on the employment calculations to the docs.

Copy link
Copy Markdown
Contributor

@patrickbrown4 patrickbrown4 Apr 29, 2026

Choose a reason for hiding this comment

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

I'd suggest transposing this file (construction/fom as columns and sources as rows); then it would match the format of the other files, and you could add new sources without every line showing up as changed. And I guess you could add a vom column (all zero values) to exactly match the format of the others.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
jtype,JEDI,Mayfield,Rutovitz,Ram
construction,0.00000331,0.00000499,0.00000029,0.00000596
fom,0.00075584,0.444,0,0
206 changes: 206 additions & 0 deletions inputs/employment/employment_factor_plant_JEDI.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
,construction,fom,vom
battery_li,0.937020565,0.033333333,0
biopower,3.76446807,1.453074326,0
beccs_mod,3.76446807,1.453074326,0
beccs_max,3.76446807,1.453074326,0
coal-CCS_mod,4.196159448,0.186153846,0.00005346
coal-CCS_max,4.196159448,0.186153846,0.00005346
coal-CCS-F1,4.196159448,0.186153846,0.00005346
coal-CCS-F2,4.196159448,0.186153846,0.00005346
coal-CCS-F3,4.196159448,0.186153846,0.00005346
Coal-IGCC,4.149232006,0.181538462,0.00003725
coal-new,2.663868535,0.16,0.00003948
CoalOldScr,2.663868535,0.16,0.00003948
CoalOldUns,2.663868535,0.16,0.00003948
CofireNew,2.663868535,0.16,0.00003948
CofireOld,2.663868535,0.16,0.00003948
csp-ns,5.860286945,0.257823504,0
distpv,2.97777666,0.203887755,0
Gas-CC,0.57898781,0.052,0.00002764
Gas-CC-CCS_mod,1.301540146,0.072,0.00005346
Gas-CC-CCS_max,1.301540146,0.072,0.00005346
Gas-CC-CCS-F1,1.301540146,0.072,0.00005346
Gas-CC-CCS-F2,1.301540146,0.072,0.00005346
Gas-CC-CCS-F3,1.301540146,0.072,0.00005346
Gas-CT,1.124155973,0.28,0.00004233
H2-CT,1.124155973,0.28,0
H2-CC,0.57898781,0.052,0
geothermal,4.614237729,0.15681119,0.00003511
Hydro,3.088992778,0.019831569,0
lfill-gas,0.57898781,0.052,0
Nuclear,13.74608053,1.042875956,0.00002946
Nuclear-SMR,4.35325963,0.278978818,0.00001645
o-g-s,0.57898781,0.052,0.00002764
pumped-hydro,4.437357277,0.105776354,0
pumped-hydro-flex,4.437357277,0.105776354,0
upv_1,2.31800771,0.049966822,0
upv_2,2.31800771,0.049966822,0
upv_3,2.31800771,0.049966822,0
upv_4,2.31800771,0.049966822,0
upv_5,2.31800771,0.049966822,0
upv_6,2.31800771,0.049966822,0
upv_7,2.31800771,0.049966822,0
upv_8,2.31800771,0.049966822,0
upv_9,2.31800771,0.049966822,0
upv_10,2.31800771,0.049966822,0
pvb1_1,2.31800771,0.049966822,0
pvb1_2,2.31800771,0.049966822,0
pvb1_3,2.31800771,0.049966822,0
pvb1_4,2.31800771,0.049966822,0
pvb1_5,2.31800771,0.049966822,0
pvb1_6,2.31800771,0.049966822,0
pvb1_7,2.31800771,0.049966822,0
pvb1_8,2.31800771,0.049966822,0
pvb1_9,2.31800771,0.049966822,0
pvb1_10,2.31800771,0.049966822,0
pvb2_1,2.31800771,0.049966822,0
pvb2_2,2.31800771,0.049966822,0
pvb2_3,2.31800771,0.049966822,0
pvb2_4,2.31800771,0.049966822,0
pvb2_5,2.31800771,0.049966822,0
pvb2_6,2.31800771,0.049966822,0
pvb2_7,2.31800771,0.049966822,0
pvb2_8,2.31800771,0.049966822,0
pvb2_9,2.31800771,0.049966822,0
pvb2_10,2.31800771,0.049966822,0
pvb3_1,2.31800771,0.049966822,0
pvb3_2,2.31800771,0.049966822,0
pvb3_3,2.31800771,0.049966822,0
pvb3_4,2.31800771,0.049966822,0
pvb3_5,2.31800771,0.049966822,0
pvb3_6,2.31800771,0.049966822,0
pvb3_7,2.31800771,0.049966822,0
pvb3_8,2.31800771,0.049966822,0
pvb3_9,2.31800771,0.049966822,0
pvb3_10,2.31800771,0.049966822,0
wind-ofs_1,1.747743604,0.11549396,0
wind-ofs_2,1.747743604,0.11549396,0
wind-ofs_3,1.747743604,0.11549396,0
wind-ofs_4,1.747743604,0.11549396,0
wind-ofs_5,1.747743604,0.11549396,0
wind-ofs_6,1.747743604,0.11549396,0
wind-ofs_7,1.747743604,0.11549396,0
wind-ofs_8,1.747743604,0.11549396,0
wind-ofs_9,1.747743604,0.11549396,0
wind-ofs_10,1.747743604,0.11549396,0
wind-ons_1,1.233305044,0.033060233,0
wind-ons_2,1.233305044,0.033060233,0
wind-ons_3,1.233305044,0.033060233,0
wind-ons_4,1.233305044,0.033060233,0
wind-ons_5,1.233305044,0.033060233,0
wind-ons_6,1.233305044,0.033060233,0
wind-ons_7,1.233305044,0.033060233,0
wind-ons_8,1.233305044,0.033060233,0
wind-ons_9,1.233305044,0.033060233,0
wind-ons_10,1.233305044,0.033060233,0
csp1_1,5.860286945,0.257823504,0
csp1_2,5.860286945,0.257823504,0
csp1_3,5.860286945,0.257823504,0
csp1_4,5.860286945,0.257823504,0
csp1_5,5.860286945,0.257823504,0
csp1_6,5.860286945,0.257823504,0
csp1_7,5.860286945,0.257823504,0
csp1_8,5.860286945,0.257823504,0
csp1_9,5.860286945,0.257823504,0
csp1_10,5.860286945,0.257823504,0
csp1_11,5.860286945,0.257823504,0
csp1_12,5.860286945,0.257823504,0
csp2_1,5.860286945,0.257823504,0
csp2_2,5.860286945,0.257823504,0
csp2_3,5.860286945,0.257823504,0
csp2_4,5.860286945,0.257823504,0
csp2_5,5.860286945,0.257823504,0
csp2_6,5.860286945,0.257823504,0
csp2_7,5.860286945,0.257823504,0
csp2_8,5.860286945,0.257823504,0
csp2_9,5.860286945,0.257823504,0
csp2_10,5.860286945,0.257823504,0
csp2_11,5.860286945,0.257823504,0
csp2_12,5.860286945,0.257823504,0
csp3_1,5.860286945,0.257823504,0
csp3_2,5.860286945,0.257823504,0
csp3_3,5.860286945,0.257823504,0
csp3_4,5.860286945,0.257823504,0
csp3_5,5.860286945,0.257823504,0
csp3_6,5.860286945,0.257823504,0
csp3_7,5.860286945,0.257823504,0
csp3_8,5.860286945,0.257823504,0
csp3_9,5.860286945,0.257823504,0
csp3_10,5.860286945,0.257823504,0
csp3_11,5.860286945,0.257823504,0
csp3_12,5.860286945,0.257823504,0
csp4_1,5.860286945,0.257823504,0
csp4_2,5.860286945,0.257823504,0
csp4_3,5.860286945,0.257823504,0
csp4_4,5.860286945,0.257823504,0
csp4_5,5.860286945,0.257823504,0
csp4_6,5.860286945,0.257823504,0
csp4_7,5.860286945,0.257823504,0
csp4_8,5.860286945,0.257823504,0
csp4_9,5.860286945,0.257823504,0
csp4_10,5.860286945,0.257823504,0
csp4_11,5.860286945,0.257823504,0
csp4_12,5.860286945,0.257823504,0
hydD,3.088992778,0.019831569,0
hydND,3.088992778,0.019831569,0
hydSD,3.088992778,0.019831569,0
hydSND,3.088992778,0.019831569,0
hydUD,3.088992778,0.019831569,0
hydUND,3.088992778,0.019831569,0
hydNPD,3.088992778,0.019831569,0
hydNPND,3.088992778,0.019831569,0
hydED,3.088992778,0.019831569,0
hydEND,3.088992778,0.019831569,0
egs_allkm_1,5.506553405,0.151210424,0.00004967
egs_allkm_2,5.506553405,0.151210424,0.00004967
egs_allkm_3,5.506553405,0.151210424,0.00004967
egs_allkm_4,5.506553405,0.151210424,0.00004967
egs_allkm_5,5.506553405,0.151210424,0.00004967
egs_allkm_6,5.506553405,0.151210424,0.00004967
egs_allkm_7,5.506553405,0.151210424,0.00004967
egs_allkm_8,5.506553405,0.151210424,0.00004967
egs_allkm_9,5.506553405,0.151210424,0.00004967
egs_allkm_10,5.506553405,0.151210424,0.00004967
geohydro_allkm_1,4.614237729,0.15681119,0.00003511
geohydro_allkm_2,4.614237729,0.15681119,0.00003511
geohydro_allkm_3,4.614237729,0.15681119,0.00003511
geohydro_allkm_4,4.614237729,0.15681119,0.00003511
geohydro_allkm_5,4.614237729,0.15681119,0.00003511
geohydro_allkm_6,4.614237729,0.15681119,0.00003511
geohydro_allkm_7,4.614237729,0.15681119,0.00003511
geohydro_allkm_8,4.614237729,0.15681119,0.00003511
geohydro_allkm_9,4.614237729,0.15681119,0.00003511
geohydro_allkm_10,4.614237729,0.15681119,0.00003511
egs_nearfield_1,5.506553405,0.151210424,0.00004967
egs_nearfield_2,5.506553405,0.151210424,0.00004967
egs_nearfield_3,5.506553405,0.151210424,0.00004967
egs_nearfield_4,5.506553405,0.151210424,0.00004967
egs_nearfield_5,5.506553405,0.151210424,0.00004967
egs_nearfield_6,5.506553405,0.151210424,0.00004967
egs_nearfield_7,5.506553405,0.151210424,0.00004967
egs_nearfield_8,5.506553405,0.151210424,0.00004967
egs_nearfield_9,5.506553405,0.151210424,0.00004967
egs_nearfield_10,5.506553405,0.151210424,0.00004967
Gas-CT_H2-CT,1.124155973,0.28,0.00004233
Gas-CC_H2-CC,0.57898781,0.052,0.00002764
CoalOldUns_CoalOldScr,2.663868535,0.16,0.00003948
CoalOldUns_CofireOld,2.663868535,0.16,0.00003948
CoalOldScr_CofireOld,2.663868535,0.16,0.00003948
coal-new_CofireNew,2.663868535,0.16,0.00003948
Gas-CC_Gas-CC-CCS_mod,0.858296124,0.084,0.00005634
Coal-IGCC_coal-CCS_mod,1.617499527,0.156923077,0.00005634
coal-new_coal-CCS_mod,1.617499527,0.156923077,0.00005634
CoalOldScr_coal-CCS_mod,1.617499527,0.156923077,0.00005634
CoalOldUns_coal-CCS_mod,1.617499527,0.156923077,0.00005634
CofireNew_coal-CCS_mod,1.617499527,0.156923077,0.00005634
CofireOld_coal-CCS_mod,1.617499527,0.156923077,0.00005634
Gas-CC_Gas-CC-CCS_max,0.858296124,0.084,0.00005634
Coal-IGCC_coal-CCS_max,1.617499527,0.156923077,0.00005634
coal-new_coal-CCS_max,1.617499527,0.156923077,0.00005634
CoalOldScr_coal-CCS_max,1.617499527,0.156923077,0.00005634
CoalOldUns_coal-CCS_max,1.617499527,0.156923077,0.00005634
CofireNew_coal-CCS_max,1.617499527,0.156923077,0.00005634
CofireOld_coal-CCS_max,1.617499527,0.156923077,0.00005634
hydEND_hydED,3.088992778,0.019831569,0
hydED_pumped-hydro,4.437357277,0.105776354,0
hydED_pumped-hydro-flex,4.437357277,0.105776354,0
Loading
Loading