MGA updates & employment outputs

cases.csv

@@ -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,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,
@@ -149,7 +150,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,
@@ -220,8 +222,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,

cases_test.csv

@@ -1,65 +1,66 @@
-,Default Value,Pacific,USA_defaults,Mid_Case,USA_decarb,github_Pacific,github_Everything,github_MA_county_CC,Pacific_CC,Pacific_weks,Pacific_full_year,Interday_storage,Pacific_2020,Pacific_rep15,WY_county,WECC_county,PJM_county_CC,NYVT_mixed,OR_water,MonteCarlo_Random,MonteCarlo_LHS,Everything,Simple,USA_fast,USA_faster,Pacific_DR,Pacific_MGA,Pacific_LoadSite95,MARICTNYNJPAOH_Offshore,R2P
-ignore,1,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,
-GSw_Region,cendiv/Pacific,,country/USA,country/USA,country/USA,,st/ID.WY.NE.IA.IL,st/MA,,,,,,,st/WY,interconnect/western,transreg/PJM,st/NY.VT,st/OR,st/NE.NY.PA,st/NE.NY.PA,st/ID.WY.NE.IA.IL,st/KS,country/USA,country/USA,,,,st/MA.RI.CT.NY.NJ.PA.OH,
-endyear,2032,,2050,2050,2050,2029,2060,2026,,,,,,,,,,,2035,2030,2030,2060,2035,2050,2050,,,,,
-yearset,,,,,,,2010..2060..10,,,,,,,,,,,,,2010..2050..5,2010..2050..5,2010..2060..10,,,2010_2025_2050,,,,,
-GSw_ZoneSet,,,,,,,z54,z3109,,,,,,,z3109,z3109,z3109,PJMcounty,,,,z54,,z54,z48,,,,,
-GSw_GasCurve,2,,1,1,,,,,,,,,,,,,,,,,,,,1,1,,,,,
-GSw_Geothermal,,,,2,,,,,,,,,,,,,,,,,,,0,,0,,,,,
-GSw_GrowthPenalties,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
-GSw_Upstream,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
-GSw_TransHurdleRate,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,
-distpvscen,,,,,stscen2023_mid_case_95_by_2035,,,,,,,,,,,,,,,,,,,,,,,,,
-GSw_AnnualCap,,,,,2,,1,,,,,,,,,,,,,,,1,,,,,,,,
-GSw_AnnualCapScen,,,,,start2024_90pct2035_100pct2045,,start2027_95pct2035,,,,,,,,,,,,,,,start2027_95pct2035,,,,,,,,
-GSw_LoadProfiles,,,,,EER2025_100by2050,EER2025_IRAlow,EER2025_IRAlow,EER2025_IRAlow,,,,,historic,,,,,,,,,EER2025_100by2050,,,,historic,,,,
-GSw_NG_CRF_penalty,,,,,ramp_2045,,ramp_2023_2035,,,,,,,,,,,,,,,ramp_2023_2035,,,,,,,,
-GSw_PRM_NetImportLimit,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,
-GSw_RetirePenalty,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,
-GSw_FakeData,,,,,,1,1,1,,,,,,,,,,,,,,,,,,,,,,
-GSw_PRM_CapCredit,,,,,,,,1,1,,,,,,,,1,,,,,,,,,,,,,
-GSw_PRM_scenario,,,,,,,,,static,,,,,,,,static,,,,,,,,,,,,,
-GSw_PRM_UpdateMethod,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,
-GSw_HourlyType,,,,,,,,,,wek,year,,,,,,,,,,,,,,,,,,,
-GSw_InterDayLinkage,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,
-GSw_HourlyWeatherYears,,,,,,,2012_2013,,,,,,2020,2007_2008_2009_2010_2011_2012_2013_2016_2017_2018_2019_2020_2021_2022_2023,,,,,,,,2012_2013,,,,2018,,,,
-GSw_HourlyClusterMapMethod,,,,,,,,,,,,,,bestfirst,,,,,,,,,,,,,,,,
-GSw_WaterCapacity,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
-GSw_WaterMain,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
-GSw_WaterUse,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,
-resource_adequacy_years,,,,,,,2011_2012_2013_2021_2022_2023,,,,,,,,,,,,,,,2011_2012_2013_2021_2022_2023,,,,,,,,
-GSw_HourlyClusterAlgorithm,,,,,,,,,,,,,,,,,,,,user,user,,,,,,,,,
-MCS_runs,,,,,,,,,,,,,,,,,,,,2,2,,,,,,,,,
-MCS_dist_groups,,,,,,,,,,,,,,,,,,,,tech.hydro.nuclear.gas.coal.load_country,upv_tri.nuclear_tri.ng_fuel_price_tri.load_country_unif,,,,,,,,,
-MCS_lhs,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,
-GSw_PRM_StressIterateMax,,,,,,,,0,,,,,,,,0,0,,,1,1,,,,,,,,,
-GSw_ReducedResource,,,,,,,1,,,,,,,,,,,,,,,1,,,,,,,,
-GSw_SitingUPV,,,,,,limited,limited,limited,,,,,,,,,,,,,,limited,,,,,,,,
-GSw_SitingWindOfs,,,,,,limited,limited,limited,,,,,,,,,,,,,,open,,,,,,,,
-GSw_SitingWindOns,,,,,,limited,limited,limited,,,,,,,,,,,,,,limited,,,,,,,,
-GSw_TransScen,,,,,,,NTP_MT,,,,,,,,,,,,,,,NTP_MT,,,,,,,,
-GSw_CO2_Detail,,,,,,,1,,,,,,,,,,,,,,,1,,,,,,,,
-GSw_DAC,,,,,,,1,,,,,,,,,,,,,,,1,,,,,,,,
-GSw_NoFossilOffsetCDR,,,,,,,1,,,,,,,,,,,,,,,1,,,,,,,,
-GSw_Biopower,,,,,,,,,,,,,,,,,,,,,,,0,,0,,,,,
-GSw_HourlyChunkLengthRep,,,,,,,,,,,,,,,,,,,,,,,6,4,4,,,,,
-GSw_HourlyChunkLengthStress,,,,,,,,,,,,,,,,,,,,,,,6,4,4,,,,,
-GSw_LfillGas,,,,,,,,,,,,,,,,,,,,,,,0,,0,,,,,
-GSw_Nuclear,,,,,,,,,,,,,,,,,,,,,,,0,,0,,,,,
-GSw_OpRes,,,,,,,,,,,,,,,,,,,,,,,0,,0,,,,,
-GSw_StartCost,,,,,,,,,,,,,,,,,,,,,,,0,0,0,,,,,
-GSw_H2,,,,,,,,,,,,,,,,,,,,,,,,0,0,,,,,
-GSw_H2_PTC,,,,,,,,,,,,,,,,,,,,,,,,0,0,,,,,
-GSw_H2Combustion,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,
-GSw_DRShed,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,
-GSw_MGA_CostDelta,,,,,,,,,,,,,,,,,,,,,,,,,,,0.01,,,
-GSw_LoadSiteCF,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.95,,
-GSw_OffshoreZones,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-GSw_OffshoreBackbone,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-GSw_OffshoreBackflow,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
-pras_agg_ogs_lfillgas,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
-pras_existing_unit_size,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0
-pras_scheduled_outage,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0
-pras_unitsize_source,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,r2x
-pras_vre_combine,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
-pras_samples,,,,,,10,10,10,,,,,,,,,,,,,,,,10,10,,,,,
+,Default Value,Pacific,USA_defaults,Mid_Case,USA_decarb,github_Pacific,github_Everything,github_MA_county_CC,Pacific_CC,Pacific_weks,Pacific_full_year,Interday_storage,Pacific_2020,Pacific_rep15,WY_county,WECC_county,PJM_county_CC,NYVT_mixed,OR_water,MonteCarlo_Random,MonteCarlo_LHS,Everything,Simple,USA_fast,USA_faster,Pacific_DR,Pacific_MGA,USA_MGA_fast,Pacific_LoadSite95,MARICTNYNJPAOH_Offshore,R2P
+ignore,1,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+GSw_Region,cendiv/Pacific,,country/USA,country/USA,country/USA,,st/ID.WY.NE.IA.IL,st/MA,,,,,,,st/WY,interconnect/western,transreg/PJM,st/NY.VT,st/OR,st/NE.NY.PA,st/NE.NY.PA,st/ID.WY.NE.IA.IL,st/KS,country/USA,country/USA,,,country/USA,,st/MA.RI.CT.NY.NJ.PA.OH,
+endyear,2032,,2050,2050,2050,2029,2060,2026,,,,,,,,,,,2035,2030,2030,2060,2035,2050,2050,,,2050,,,
+yearset,,,,,,,2010..2060..10,,,,,,,,,,,,,2010..2050..5,2010..2050..5,2010..2060..10,,,2010_2025_2050,,,2010_2015_2020..2050..5,,,
+GSw_ZoneSet,,,,,,,z54,z3109,,,,,,,z3109,z3109,z3109,PJMcounty,,,,z54,,z54,z48,,,z54,,,
+GSw_GasCurve,2,,1,1,,,,,,,,,,,,,,,,,,,,1,1,,,,,,
+GSw_Geothermal,,,,2,,,,,,,,,,,,,,,,,,,0,,0,,,,,,
+GSw_GrowthPenalties,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
+GSw_Upstream,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
+GSw_TransHurdleRate,,,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,
+distpvscen,,,,,stscen2023_mid_case_95_by_2035,,,,,,,,,,,,,,,,,,,,,,,,,,
+GSw_AnnualCap,,,,,2,,1,,,,,,,,,,,,,,,1,,,,,,,,,
+GSw_AnnualCapScen,,,,,start2024_90pct2035_100pct2045,,start2027_95pct2035,,,,,,,,,,,,,,,start2027_95pct2035,,,,,,,,,
+GSw_LoadProfiles,,,,,EER2025_100by2050,EER2025_IRAlow,EER2025_IRAlow,EER2025_IRAlow,,,,,historic,,,,,,,,,EER2025_100by2050,,,,historic,,,,,
+GSw_NG_CRF_penalty,,,,,ramp_2045,,ramp_2023_2035,,,,,,,,,,,,,,,ramp_2023_2035,,,,,,,,,
+GSw_PRM_NetImportLimit,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,
+GSw_RetirePenalty,,,,,0,,,,,,,,,,,,,,,,,,,,,,,,,,
+GSw_FakeData,,,,,,1,1,1,,,,,,,,,,,,,,,,,,,,,,,
+GSw_PRM_CapCredit,,,,,,,,1,1,,,,,,,,1,,,,,,,,,,,,,,
+GSw_PRM_scenario,,,,,,,,,static,,,,,,,,static,,,,,,,,,,,,,,
+GSw_PRM_UpdateMethod,,,,,,,,,1,,,,,,,,,,,,,,,,,,,,,,
+GSw_HourlyType,,,,,,,,,,wek,year,,,,,,,,,,,,,,,,,,,,
+GSw_InterDayLinkage,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,,,
+GSw_HourlyWeatherYears,,,,,,,2012_2013,,,,,,2020,2007_2008_2009_2010_2011_2012_2013_2016_2017_2018_2019_2020_2021_2022_2023,,,,,,,,2012_2013,,,,2018,,,,,
+GSw_HourlyClusterMapMethod,,,,,,,,,,,,,,bestfirst,,,,,,,,,,,,,,,,,
+GSw_WaterCapacity,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
+GSw_WaterMain,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
+GSw_WaterUse,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,
+resource_adequacy_years,,,,,,,2011_2012_2013_2021_2022_2023,,,,,,,,,,,,,,,2011_2012_2013_2021_2022_2023,,,,,,,,,
+GSw_HourlyClusterAlgorithm,,,,,,,,,,,,,,,,,,,,user,user,,,,,,,,,,
+MCS_runs,,,,,,,,,,,,,,,,,,,,2,2,,,,,,,,,,
+MCS_dist_groups,,,,,,,,,,,,,,,,,,,,tech.hydro.nuclear.gas.coal.load_country,upv_tri.nuclear_tri.ng_fuel_price_tri.load_country_unif,,,,,,,,,,
+MCS_lhs,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,
+GSw_PRM_StressIterateMax,,,,,,,,0,,,,,,,,0,0,,,1,1,,,,,,,,,,
+GSw_ReducedResource,,,,,,,1,,,,,,,,,,,,,,,1,,,,,,,,,
+GSw_SitingUPV,,,,,,limited,limited,limited,,,,,,,,,,,,,,limited,,,,,,,,,
+GSw_SitingWindOfs,,,,,,limited,limited,limited,,,,,,,,,,,,,,open,,,,,,,,,
+GSw_SitingWindOns,,,,,,limited,limited,limited,,,,,,,,,,,,,,limited,,,,,,,,,
+GSw_TransScen,,,,,,,NTP_MT,,,,,,,,,,,,,,,NTP_MT,,,,,,,,,
+GSw_CO2_Detail,,,,,,,1,,,,,,,,,,,,,,,1,,,,,,,,,
+GSw_DAC,,,,,,,1,,,,,,,,,,,,,,,1,,,,,,,,,
+GSw_NoFossilOffsetCDR,,,,,,,1,,,,,,,,,,,,,,,1,,,,,,,,,
+GSw_Biopower,,,,,,,,,,,,,,,,,,,,,,,0,,0,,,,,,
+GSw_HourlyChunkLengthRep,,,,,,,,,,,,,,,,,,,,,,,6,4,4,,,4,,,
+GSw_HourlyChunkLengthStress,,,,,,,,,,,,,,,,,,,,,,,6,4,4,,,4,,,
+GSw_LfillGas,,,,,,,,,,,,,,,,,,,,,,,0,,0,,,,,,
+GSw_Nuclear,,,,,,,,,,,,,,,,,,,,,,,0,,0,,,,,,
+GSw_OpRes,,,,,,,,,,,,,,,,,,,,,,,0,,0,,,,,,
+GSw_StartCost,,,,,,,,,,,,,,,,,,,,,,,0,0,0,,,,,,
+GSw_H2,,,,,,,,,,,,,,,,,,,,,,,,0,0,,,0,,,
+GSw_H2_PTC,,,,,,,,,,,,,,,,,,,,,,,,0,0,,,0,,,
+GSw_H2Combustion,,,,,,,,,,,,,,,,,,,,,,,,,0,,,,,,
+GSw_DRShed,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,
+GSw_MGA_CostDelta,,,,,,,,,,,,,,,,,,,,,,,,,,,0.01,0.01,,,
+GSw_gopt_mga,,,,,,,,,,,,,,,,,,,,,,,,,,,,4,,,
+GSw_LoadSiteCF,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.95,,
+GSw_OffshoreZones,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+GSw_OffshoreBackbone,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+GSw_OffshoreBackflow,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,
+pras_agg_ogs_lfillgas,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
+pras_existing_unit_size,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0
+pras_scheduled_outage,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,0
+pras_unitsize_source,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,r2x
+pras_vre_combine,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1
+pras_samples,,,,,,10,10,10,,,,,,,,,,,,,,,,10,10,,,,,,

docs/source/user_guide.md

@@ -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`.

docs/sources.csv

@@ -507,6 +507,7 @@ RelativeFilePath,RelativeFolderPath,FileName_new,FileExtension,Description_new,I
 /inputs/sets/e.csv,/inputs/sets,e,.csv,set of emission categories used in model,,,,GAMS set,
 /inputs/sets/eall.csv,/inputs/sets,eall,.csv,set of emission categories used in reporting,,,,GAMS set,
 /inputs/sets/etype.csv,/inputs/sets,etype,.csv,,,,,,
+/inputs/sets/jtype.csv,/inputs/sets,jtype,.csv,,,,,,
 /inputs/sets/f.csv,/inputs/sets,f,.csv,set of fuel types,,,,GAMS set,
 /inputs/sets/flex_type.csv,/inputs/sets,flex_type,.csv,set of demand flexibility types,,,,GAMS set,
 /inputs/sets/fuel2tech.csv,/inputs/sets,fuel2tech,.csv,mapping between fuel types and generations,,,,GAMS set,

inputs/employment/employment_factor_inter_transmission.csv

@@ -0,0 +1,5 @@
+,construction,fom,vom
+jedi,0.00000331,0.00075584,0
+mayfield,0.00000499,0.444,0
+rutovitz,0.00000029,0,0
+ram,0.00000596,0,0