Skip to content

Commit

Permalink
Update hydrogen (#4)
Browse files Browse the repository at this point in the history
* Replace Hydrogen SubRES

* Remove H2 import

* Update Groups.json

* Add ~$*.* pattern to .gitignore

* Add a hydrogen export process

* Update H2 name in reporting sets

* Add H2 and electricity storage sets

* Correct storage input data and enable vintage tracking

* Move storage efficiency and availability to a neighboring table

* Add new tables and global filters; update cases and groups

* Redefine Hydrogen commodities on DayNite level

* Add a scenario without Bio CCS

* Apply IND constraints from 2022

* Use space heating CGs for defining ambient heat share

* Use FLO_EFF instead of FLO_SHAR to account for ambient heat

* Remove RSDAHT2 (use RSDAHT instead)
  • Loading branch information
olejandro authored Jan 24, 2024
1 parent 65a4082 commit 71433a0
Show file tree
Hide file tree
Showing 25 changed files with 295 additions and 154 deletions.
66 changes: 33 additions & 33 deletions AppData/Cases.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
[
{
"CaseId": 27,
"CreatedOn": "2022-09-26 03:08",
"CaseId": 47,
"CreatedOn": "2023-12-21 09:00",
"Description": "",
"EditedOn": "2022-10-04 17:10",
"EndingYear": "2070",
"EditedOn": "2023-12-21 09:00",
"EndingYear": "2050",
"FixResultFileName": "True",
"FixResultInfo": {
"WorkTimesFolderPath": "",
"WorkTimesFolderPath": "D:\\Veda\\Veda_models\\~g2v_TIM\\dev-hydrogen\\AppData\\GAMSSAVE",
"GdxElasticDermands": {
"GdxSelectedFile": {
"FileName": "",
Expand All @@ -29,7 +29,7 @@
"FixYearsUpto": "2022",
"GdxSelectedFile": {
"FileName": "no_mitigation",
"FilePath": "C:\\VEDA\\GAMS_WrkTIMES\\No_Mitigation\\GamsSave\\no_mitigation.gdx",
"FilePath": "D:\\Veda\\Veda_models\\~g2v_TIM\\dev-hydrogen\\AppData\\GAMSSAVE\\no_mitigation.gdx",
"IsSelected": true
},
"IsApplied": true,
Expand All @@ -41,26 +41,26 @@
"Name": "Mitigation_CB",
"ParametricGroup": null,
"ParametricGroupId": null,
"PeriodsDefinition": "p23",
"PeriodsDefinition": "p39",
"PropertiesGroup": "DefaultProperties",
"PropertiesGroupId": 49,
"PropertiesGroupId": 21,
"RegionGroup": "SingleRegion",
"RegionGroupId": 51,
"RegionGroupId": 23,
"ScenarioGroup": "MitigationCAP2021CB",
"ScenarioGroupId": 52,
"ScenarioGroupId": 26,
"Solver": "cplex",
"SolverOptionFile": "cplex",
"UserName": "olex"
"UserName": "ESMA"
},
{
"CaseId": 24,
"CreatedOn": "2021-04-08 15:35",
"CaseId": 52,
"CreatedOn": "2023-12-21 09:00",
"Description": "",
"EditedOn": "2022-10-04 05:03",
"EndingYear": "2070",
"EditedOn": "2023-12-21 09:00",
"EndingYear": "2050",
"FixResultFileName": "True",
"FixResultInfo": {
"WorkTimesFolderPath": "",
"WorkTimesFolderPath": "D:\\Veda\\Veda_models\\~g2v_TIM\\dev-hydrogen\\AppData\\GAMSSAVE",
"GdxElasticDermands": {
"GdxSelectedFile": {
"FileName": "",
Expand All @@ -82,7 +82,7 @@
"FixYearsUpto": "2022",
"GdxSelectedFile": {
"FileName": "no_mitigation",
"FilePath": "C:\\VEDA\\GAMS_WrkTIMES\\No_Mitigation\\GamsSave\\no_mitigation.gdx",
"FilePath": "D:\\Veda\\Veda_models\\~g2v_TIM\\dev-hydrogen\\AppData\\GAMSSAVE\\no_mitigation.gdx",
"IsSelected": true
},
"IsApplied": true,
Expand All @@ -91,26 +91,26 @@
"IsApplyFixResult": true
},
"GAMSSourceFolder": "GAMS_SrcTIMES",
"Name": "Mitigation_WAM",
"Name": "Mitigation_CB-NoBioCCS",
"ParametricGroup": null,
"ParametricGroupId": null,
"PeriodsDefinition": "p23",
"PeriodsDefinition": "p39",
"PropertiesGroup": "DefaultProperties",
"PropertiesGroupId": 49,
"PropertiesGroupId": 21,
"RegionGroup": "SingleRegion",
"RegionGroupId": 51,
"ScenarioGroup": "MitigationWAM",
"ScenarioGroupId": 56,
"RegionGroupId": 23,
"ScenarioGroup": "MitigationCAP2021CB-noBioCCS",
"ScenarioGroupId": 77,
"Solver": "cplex",
"SolverOptionFile": "cplex",
"UserName": "olex"
"UserName": "ESMA"
},
{
"CaseId": 25,
"CreatedOn": "2021-03-02 13:00",
"CaseId": 49,
"CreatedOn": "2023-12-21 09:00",
"Description": "",
"EditedOn": "2022-10-04 22:22",
"EndingYear": "2070",
"EditedOn": "2023-12-21 09:00",
"EndingYear": "2050",
"FixResultFileName": "False",
"FixResultInfo": {
"WorkTimesFolderPath": null,
Expand Down Expand Up @@ -147,15 +147,15 @@
"Name": "No_Mitigation",
"ParametricGroup": null,
"ParametricGroupId": null,
"PeriodsDefinition": "p23",
"PeriodsDefinition": "p39",
"PropertiesGroup": "DefaultProperties",
"PropertiesGroupId": 49,
"PropertiesGroupId": 21,
"RegionGroup": "SingleRegion",
"RegionGroupId": 51,
"RegionGroupId": 23,
"ScenarioGroup": "NoMitigation",
"ScenarioGroupId": 57,
"ScenarioGroupId": 24,
"Solver": "cplex",
"SolverOptionFile": "cplex",
"UserName": "olex"
"UserName": "ESMA"
}
]
15 changes: 12 additions & 3 deletions AppData/GlobalFilters.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
[
{
"Description": "IE 2018, 2020-2050 with 5 year step",
"EditedOn": "2021-06-16 22:05",
"EditedOn": "2023-12-21 09:00",
"LastAccessed": "2023-12-21 09:00",
"Filter": "{\"period\":[\"2018\",\"2020\",\"2025\",\"2030\",\"2035\",\"2040\",\"2045\",\"2050\"],\"region\":[\"IE\"]}",
"Name": "ie_2018_and_2020-2050_5ys"
},
{
"Description": "IE P39 from 2020 to 2050",
"EditedOn": "2023-12-21 09:00",
"LastAccessed": "2023-12-21 09:00",
"Filter": "{\"period\":[\"2020\",\"2021\",\"2022\",\"2023\",\"2024\",\"2025\",\"2026\",\"2027\",\"2028\",\"2029\",\"2030\",\"2031\",\"2032\",\"2033\",\"2034\",\"2035\",\"2036\",\"2037\",\"2038\",\"2039\",\"2040\",\"2041\",\"2042\",\"2043\",\"2044\",\"2045\",\"2046\",\"2047\",\"2048\",\"2049\",\"2050\"],\"region\":[\"IE\"]}",
"Name": "ie_p39_2020-2050"
},
{
"Description": "IE P39 until 2050",
"EditedOn": "2021-06-16 22:05",
"EditedOn": "2023-12-21 09:00",
"LastAccessed": "2023-12-21 09:00",
"Filter": "{\"period\":[\"2018\",\"2019\",\"2020\",\"2021\",\"2022\",\"2023\",\"2024\",\"2025\",\"2026\",\"2027\",\"2028\",\"2029\",\"2030\",\"2031\",\"2032\",\"2033\",\"2034\",\"2035\",\"2036\",\"2037\",\"2038\",\"2039\",\"2040\",\"2041\",\"2042\",\"2043\",\"2044\",\"2045\",\"2046\",\"2047\",\"2048\",\"2049\",\"2050\"],\"region\":[\"IE\"]}",
"Name": "ie_p39_until_2050"
}
]
]
Loading

0 comments on commit 71433a0

Please sign in to comment.