Add random vector sampling method to MGA #162
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,67 @@ | ||
| ,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,MultiMetricRA,Pacific_DR,Pacific_MGA,Pacific_MGA_RV,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/NY.NJ,,,,,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..2050..5,2010_2025_2050,2010..2050..5,,,,,, | ||
| GSw_ZoneSet,,,,,,,z54,z3109,,,,,,,z3109,z3109,z3109,PJMcounty,,,,z54,z134,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,,,,,,,,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_PRM_StressThresholdMetrics,,,,,,,,,,,,,,,,,,,,,,,,,,NEUE/LOLH/LOLE/LOLD/duration/depth,,,,,, | ||
| GSw_DRShed,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,, | ||
| GSw_MGA_CostDelta,,,,,,,,,,,,,,,,,,,,,,,,,,,,0.01,0.01,,, | ||
| GSw_MGA_RV_runs,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,, | ||
| 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,,,,,,, |
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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -93,6 +93,8 @@ $gdxin | |||||
| set land(r) "land-based (not offshore) zones" ; | ||||||
| land(r)$[not offshore(r)] = yes ; | ||||||
|
|
||||||
|
|
||||||
|
|
||||||
| sets | ||||||
| *The following two sets: | ||||||
| *ban - will remove the technology from being considered, anywhere | ||||||
|
|
@@ -6025,6 +6027,35 @@ employment_factor_plant(i,"construction") | |||||
| = employment_factor_plant(i,"construction") * upgrade_ratio(i) ; | ||||||
| $endif.upgrade_ef | ||||||
|
|
||||||
| *==================================== | ||||||
| * --- MGA Random Vector Weights --- | ||||||
| *==================================== | ||||||
|
|
||||||
| $ifthene.mgaobj ((sameas(%GSw_MGA_Objective%,capacity))or(sameas(%GSw_MGA_Objective%,generation))) | ||||||
|
|
||||||
| parameter mga_weights(r,i_subtech) "--unitless-- weight to assign to given MGA subobjective by region" ; | ||||||
|
|
||||||
| $ifthene.mga_rv (%GSw_MGA_RV_runs%>=1) | ||||||
| parameter mga_weights_in(r,i_subtech) | ||||||
| / | ||||||
| $offlisting | ||||||
| $ondelim | ||||||
| $include inputs_case%ds%mga_weights.csv | ||||||
| $offdelim | ||||||
| $onlisting | ||||||
| / ; | ||||||
| mga_weights(r,i_subtech) = mga_weights_in(r,i_subtech) ; | ||||||
| $else.mga_rv | ||||||
| mga_weights(r,i_subtech) = 1 ; | ||||||
| $endif.mga_rv | ||||||
|
|
||||||
| $endif.mgaobj | ||||||
|
|
||||||
|
|
||||||
| *TODO: add different handling for other subobjectives with different dimensions | ||||||
| * should we also include error checking? | ||||||
|
|
||||||
|
|
||||||
|
Comment on lines
+6055
to
+6058
Contributor
There was a problem hiding this comment. Best to move to issue if you still want to address it (or just remove if it's old)
Suggested change
|
||||||
| *================================================================================================ | ||||||
| *== h- and szn-dependent sets and parameters (declared here, populated in 2_temporal_params) === | ||||||
| *================================================================================================ | ||||||
|
|
||||||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,25 @@ eq_MGA_Objective$Sw_MGA.. | |
| $[tmodel(t) | ||
| $valcap(i,v,r,t) | ||
| $%GSw_MGA_SubObjective%(i)], | ||
| CAP(i,v,r,t) | ||
| * sum{i_subtech$i_subsets(i,i_subtech), mga_weights(r,i_subtech)} | ||
| } | ||
| ; | ||
|
|
||
| * --------------------------------------------------------------------------- | ||
|
|
||
| $elseif.mgaobj %GSw_MGA_Objective% == 'generation' | ||
| Equation eq_MGA_Objective "--MW-- Defines generation for MGA" ; | ||
| Variable MGA_OBJ "--MWh-- Generation of technology to be minimized/maximied" ; | ||
| eq_MGA_Objective$Sw_MGA.. | ||
| MGA_OBJ | ||
| =e= | ||
| sum{(i,v,r,h,t) | ||
| $[tmodel(t) | ||
| $valgen(i,v,r,t) | ||
| $%GSw_MGA_SubObjective%(i)], | ||
| GEN(i,v,r,h,t) * hours(h) | ||
| * sum{i_subtech$i_subsets(i,i_subtech), mga_weights(r,i_subtech)} | ||
|
Comment on lines
+29
to
+42
Contributor
There was a problem hiding this comment. Duplicates the next block below; can instead just add |
||
| } | ||
| ; | ||
|
|
||
|
|
||
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.