Skip to content

Commit

Permalink
Merge pull request #476 from ProjectDrawdown/emissions_data
Browse files Browse the repository at this point in the history 
Support versioning of energy tams
  • Loading branch information
@denised
denised authored Sep 30, 2021
2 parents 7495af6 + 215eac2 commit 0ccff7a
Show file tree
Hide file tree
Showing 22 changed files with 306 additions and 340 deletions.
0 data/energy/pds_tam_1_sources.json → data/energy/pds_tam_sources_1.json
View file
File renamed without changes.
0 data/energy/pds_tam_2_sources.json → data/energy/pds_tam_sources_2.json
View file
File renamed without changes.
7 changes: 7 additions & 0 deletions data/energy/pds_tam_sources_current.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"Ambitious Cases": {
"Drawdown TAM: Drawdown TAM - Post Integration - Plausible Scenario": "PDS_plausible_scenario_2.csv",
"Drawdown TAM: Drawdown TAM - Post Integration - Drawdown Scenario": "PDS_drawdown_scenario_2.csv",
"Drawdown TAM: Drawdown TAM - Post Integration - Optimum Scenario": "PDS_optimum_scenario_2.csv"
}
}
0 data/energy/ref_tam_1_sources.json → data/energy/ref_tam_sources_1.json
View file
File renamed without changes.
0 data/energy/ref_tam_2_sources.json → data/energy/ref_tam_sources_2.json
View file
File renamed without changes.
248 changes: 248 additions & 0 deletions data/energy/ref_tam_sources_current.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,248 @@
{
"Baseline Cases": {
"Based on IEA, WEO-2018, Current Policies Scenario (CPS)": "tam_based_on_IEA_WEO2018_Current_Policies_Scenario_CPS.csv",
"Based on: IEA ETP 2017 Ref Tech": "tam_based_on_IEA_ETP_2017_Ref_Tech.csv",
"Based on Equinor (2018), Rivalry Scenario": "tam_based_on_Equinor_2018_Rivalry_Scenario.csv",
"Based on IEEJ Outlook - 2019, Ref Scenario": "tam_based_on_IEEJ_Outlook_2019_Ref_Scenario.csv"
},
"Conservative Cases": {
"Based on IEA, WEO-2018, New Policies Scenario (NPS)": "tam_based_on_IEA_WEO2018_New_Policies_Scenario_NPS.csv",
"Based on IEEJ Outlook - 2019, Advanced Tech Scenario": "tam_based_on_IEEJ_Outlook_2019_Advanced_Tech_Scenario.csv",
"Based on IRENA. 2018) Roadmap-2050, REmap Case": "tam_based_on_IRENA__2018_Roadmap2050_REmap_Case.csv",
"Based on Equinor (2018), Reform Scenario": "tam_based_on_Equinor_2018_Reform_Scenario.csv"
},
"Ambitious Cases": {
"Based on IEA, WEO-2018, SDS Scenario": "tam_based_on_IEA_WEO2018_SDS_Scenario.csv",
"Based on: IEA ETP 2017 B2DS": "tam_based_on_IEA_ETP_2017_B2DS.csv",
"Based on Equinor (2018), Renewal Scenario": "tam_based_on_Equinor_2018_Renewal_Scenario.csv",
"Based on: IEA ETP 2017 2DS": "tam_based_on_IEA_ETP_2017_2DS.csv"
},
"100% RES2050 Case": {
"Based on average of: LUT/EWG 2019 100% RES, Ecofys 2018 1.5C and Greenpeace 2015 Advanced Revolution": "tam_based_on_average_of_LUTEWG_2019_100_RES_Ecofys_2018_1_5C_and_Greenpeace_2015_Advanced_Revolution.csv"
},
"Region: OECD90": {
"Baseline Cases": {
"Based on: IEA ETP 2016 6DS": "tam_based_on_IEA_ETP_2016_6DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO Reference": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_Reference.csv",
"Based on: AMPERE 2014 GEM E3 Reference": "tam_based_on_AMPERE_2014_GEM_E3_Reference.csv",
"Based on: AMPERE 2014 IMAGE TIMER Reference": "tam_based_on_AMPERE_2014_IMAGE_TIMER_Reference.csv"
},
"Conservative Cases": {
"Based on: IEA ETP 2016 4DS": "tam_based_on_IEA_ETP_2016_4DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 550": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_550.csv",
"Based on: AMPERE 2014 GEM E3 550": "tam_based_on_AMPERE_2014_GEM_E3_550.csv",
"Based on: AMPERE 2014 IMAGE TIMER 550": "tam_based_on_AMPERE_2014_IMAGE_TIMER_550.csv",
"Based on: Greenpeace 2015 Reference": "tam_based_on_Greenpeace_2015_Reference.csv"
},
"Ambitious Cases": {
"Based on: IEA ETP 2016 2DS": "tam_based_on_IEA_ETP_2016_2DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 450": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_450.csv",
"Based on: AMPERE 2014 GEM E3 450": "tam_based_on_AMPERE_2014_GEM_E3_450.csv",
"Based on: AMPERE 2014 IMAGE TIMER 450": "tam_based_on_AMPERE_2014_IMAGE_TIMER_450.csv",
"Based on: Greenpeace 2015 Energy Revolution": "tam_based_on_Greenpeace_2015_Energy_Revolution.csv"
},
"100% RES2050 Case": {
"Based on: Greenpeace 2015 Advanced Revolution": "tam_based_on_Greenpeace_2015_Advanced_Revolution.csv"
}
},
"Region: Eastern Europe": {
"Baseline Cases": {
"Based on: IEA ETP 2016 6DS": "tam_based_on_IEA_ETP_2016_6DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO Reference": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_Reference.csv",
"Based on: AMPERE 2014 GEM E3 Reference": "tam_based_on_AMPERE_2014_GEM_E3_Reference.csv",
"Based on: AMPERE 2014 IMAGE TIMER Reference": "tam_based_on_AMPERE_2014_IMAGE_TIMER_Reference.csv"
},
"Conservative Cases": {
"Based on: IEA ETP 2016 4DS": "tam_based_on_IEA_ETP_2016_4DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 550": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_550.csv",
"Based on: AMPERE 2014 GEM E3 550": "tam_based_on_AMPERE_2014_GEM_E3_550.csv",
"Based on: AMPERE 2014 IMAGE TIMER 550": "tam_based_on_AMPERE_2014_IMAGE_TIMER_550.csv",
"Based on: Greenpeace 2015 Reference": "tam_based_on_Greenpeace_2015_Reference.csv"
},
"Ambitious Cases": {
"Based on: IEA ETP 2016 2DS": "tam_based_on_IEA_ETP_2016_2DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 450": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_450.csv",
"Based on: AMPERE 2014 GEM E3 450": "tam_based_on_AMPERE_2014_GEM_E3_450.csv",
"Based on: AMPERE 2014 IMAGE TIMER 450": "tam_based_on_AMPERE_2014_IMAGE_TIMER_450.csv",
"Based on: Greenpeace 2015 Energy Revolution": "tam_based_on_Greenpeace_2015_Energy_Revolution.csv"
},
"100% RES2050 Case": {
"Based on: Greenpeace 2015 Advanced Revolution": "tam_based_on_Greenpeace_2015_Advanced_Revolution.csv"
}
},
"Region: Asia (Sans Japan)": {
"Baseline Cases": {
"Based on: IEA ETP 2016 6DS": "tam_based_on_IEA_ETP_2016_6DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO Reference": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_Reference.csv",
"Based on: AMPERE 2014 GEM E3 Reference": "tam_based_on_AMPERE_2014_GEM_E3_Reference.csv",
"Based on: AMPERE 2014 IMAGE TIMER Reference": "tam_based_on_AMPERE_2014_IMAGE_TIMER_Reference.csv"
},
"Conservative Cases": {
"Based on: IEA ETP 2016 4DS": "tam_based_on_IEA_ETP_2016_4DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 550": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_550.csv",
"Based on: AMPERE 2014 GEM E3 550": "tam_based_on_AMPERE_2014_GEM_E3_550.csv",
"Based on: AMPERE 2014 IMAGE TIMER 550": "tam_based_on_AMPERE_2014_IMAGE_TIMER_550.csv",
"Based on: Greenpeace 2015 Reference": "tam_based_on_Greenpeace_2015_Reference.csv"
},
"Ambitious Cases": {
"Based on: IEA ETP 2016 2DS": "tam_based_on_IEA_ETP_2016_2DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 450": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_450.csv",
"Based on: AMPERE 2014 GEM E3 450": "tam_based_on_AMPERE_2014_GEM_E3_450.csv",
"Based on: AMPERE 2014 IMAGE TIMER 450": "tam_based_on_AMPERE_2014_IMAGE_TIMER_450.csv",
"Based on: Greenpeace 2015 Energy Revolution": "tam_based_on_Greenpeace_2015_Energy_Revolution.csv"
},
"100% RES2050 Case": {
"Based on: Greenpeace 2015 Advanced Revolution": "tam_based_on_Greenpeace_2015_Advanced_Revolution.csv"
}
},
"Region: Middle East and Africa": {
"Baseline Cases": {
"Based on: IEA ETP 2016 6DS": "tam_based_on_IEA_ETP_2016_6DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO Reference": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_Reference.csv",
"Based on: AMPERE 2014 GEM E3 Reference": "tam_based_on_AMPERE_2014_GEM_E3_Reference.csv",
"Based on: AMPERE 2014 IMAGE TIMER Reference": "tam_based_on_AMPERE_2014_IMAGE_TIMER_Reference.csv"
},
"Conservative Cases": {
"Based on: IEA ETP 2016 4DS": "tam_based_on_IEA_ETP_2016_4DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 550": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_550.csv",
"Based on: AMPERE 2014 GEM E3 550": "tam_based_on_AMPERE_2014_GEM_E3_550.csv",
"Based on: AMPERE 2014 IMAGE TIMER 550": "tam_based_on_AMPERE_2014_IMAGE_TIMER_550.csv",
"Based on: Greenpeace 2015 Reference": "tam_based_on_Greenpeace_2015_Reference.csv"
},
"Ambitious Cases": {
"Based on: IEA ETP 2016 2DS": "tam_based_on_IEA_ETP_2016_2DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 450": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_450.csv",
"Based on: AMPERE 2014 GEM E3 450": "tam_based_on_AMPERE_2014_GEM_E3_450.csv",
"Based on: AMPERE 2014 IMAGE TIMER 450": "tam_based_on_AMPERE_2014_IMAGE_TIMER_450.csv",
"Based on: Greenpeace 2015 Energy Revolution": "tam_based_on_Greenpeace_2015_Energy_Revolution.csv"
},
"100% RES2050 Case": {
"Based on: Greenpeace 2015 Advanced Revolution": "tam_based_on_Greenpeace_2015_Advanced_Revolution.csv"
}
},
"Region: Latin America": {
"Baseline Cases": {
"Based on: IEA ETP 2016 6DS": "tam_based_on_IEA_ETP_2016_6DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO Reference": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_Reference.csv",
"Based on: AMPERE 2014 GEM E3 Reference": "tam_based_on_AMPERE_2014_GEM_E3_Reference.csv",
"Based on: AMPERE 2014 IMAGE TIMER Reference": "tam_based_on_AMPERE_2014_IMAGE_TIMER_Reference.csv"
},
"Conservative Cases": {
"Based on: IEA ETP 2016 4DS": "tam_based_on_IEA_ETP_2016_4DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 550": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_550.csv",
"Based on: AMPERE 2014 GEM E3 550": "tam_based_on_AMPERE_2014_GEM_E3_550.csv",
"Based on: AMPERE 2014 IMAGE TIMER 550": "tam_based_on_AMPERE_2014_IMAGE_TIMER_550.csv",
"Based on: Greenpeace 2015 Reference": "tam_based_on_Greenpeace_2015_Reference.csv"
},
"Ambitious Cases": {
"Based on: IEA ETP 2016 2DS": "tam_based_on_IEA_ETP_2016_2DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 450": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_450.csv",
"Based on: AMPERE 2014 GEM E3 450": "tam_based_on_AMPERE_2014_GEM_E3_450.csv",
"Based on: AMPERE 2014 IMAGE TIMER 450": "tam_based_on_AMPERE_2014_IMAGE_TIMER_450.csv",
"Based on: Greenpeace 2015 Energy Revolution": "tam_based_on_Greenpeace_2015_Energy_Revolution.csv"
},
"100% RES2050 Case": {
"Based on: Greenpeace 2015 Advanced Revolution": "tam_based_on_Greenpeace_2015_Advanced_Revolution.csv"
}
},
"Region: China": {
"Baseline Cases": {
"Based on: IEA ETP 2016 6DS": "tam_based_on_IEA_ETP_2016_6DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO Reference": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_Reference.csv",
"Based on: AMPERE 2014 GEM E3 Reference": "tam_based_on_AMPERE_2014_GEM_E3_Reference.csv",
"Based on: AMPERE 2014 IMAGE TIMER Reference": "tam_based_on_AMPERE_2014_IMAGE_TIMER_Reference.csv"
},
"Conservative Cases": {
"Based on: IEA ETP 2016 4DS": "tam_based_on_IEA_ETP_2016_4DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 550": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_550.csv",
"Based on: AMPERE 2014 GEM E3 550": "tam_based_on_AMPERE_2014_GEM_E3_550.csv",
"Based on: AMPERE 2014 IMAGE TIMER 550": "tam_based_on_AMPERE_2014_IMAGE_TIMER_550.csv",
"Based on: Greenpeace 2015 Reference": "tam_based_on_Greenpeace_2015_Reference.csv"
},
"Ambitious Cases": {
"Based on: IEA ETP 2016 2DS": "tam_based_on_IEA_ETP_2016_2DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 450": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_450.csv",
"Based on: AMPERE 2014 GEM E3 450": "tam_based_on_AMPERE_2014_GEM_E3_450.csv",
"Based on: AMPERE 2014 IMAGE TIMER 450": "tam_based_on_AMPERE_2014_IMAGE_TIMER_450.csv",
"Based on: Greenpeace 2015 Energy Revolution": "tam_based_on_Greenpeace_2015_Energy_Revolution.csv"
},
"100% RES2050 Case": {
"Based on: Greenpeace 2015 Advanced Revolution": "tam_based_on_Greenpeace_2015_Advanced_Revolution.csv"
}
},
"Region: India": {
"Baseline Cases": {
"Based on: IEA ETP 2016 6DS": "tam_based_on_IEA_ETP_2016_6DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO Reference": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_Reference.csv",
"Based on: AMPERE 2014 GEM E3 Reference": "tam_based_on_AMPERE_2014_GEM_E3_Reference.csv",
"Based on: AMPERE 2014 IMAGE TIMER Reference": "tam_based_on_AMPERE_2014_IMAGE_TIMER_Reference.csv"
},
"Conservative Cases": {
"Based on: IEA ETP 2016 4DS": "tam_based_on_IEA_ETP_2016_4DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 550": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_550.csv",
"Based on: AMPERE 2014 GEM E3 550": "tam_based_on_AMPERE_2014_GEM_E3_550.csv",
"Based on: AMPERE 2014 IMAGE TIMER 550": "tam_based_on_AMPERE_2014_IMAGE_TIMER_550.csv",
"Based on: Greenpeace 2015 Reference": "tam_based_on_Greenpeace_2015_Reference.csv"
},
"Ambitious Cases": {
"Based on: IEA ETP 2016 2DS": "tam_based_on_IEA_ETP_2016_2DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 450": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_450.csv",
"Based on: AMPERE 2014 GEM E3 450": "tam_based_on_AMPERE_2014_GEM_E3_450.csv",
"Based on: AMPERE 2014 IMAGE TIMER 450": "tam_based_on_AMPERE_2014_IMAGE_TIMER_450.csv",
"Based on: Greenpeace 2015 Energy Revolution": "tam_based_on_Greenpeace_2015_Energy_Revolution.csv"
},
"100% RES2050 Case": {
"Based on: Greenpeace 2015 Advanced Revolution": "tam_based_on_Greenpeace_2015_Advanced_Revolution.csv"
}
},
"Region: EU": {
"Baseline Cases": {
"Based on: IEA ETP 2016 6DS": "tam_based_on_IEA_ETP_2016_6DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO Reference": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_Reference.csv",
"Based on: AMPERE 2014 GEM E3 Reference": "tam_based_on_AMPERE_2014_GEM_E3_Reference.csv",
"Based on: AMPERE 2014 IMAGE TIMER Reference": "tam_based_on_AMPERE_2014_IMAGE_TIMER_Reference.csv"
},
"Conservative Cases": {
"Based on: IEA ETP 2016 4DS": "tam_based_on_IEA_ETP_2016_4DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 550": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_550.csv",
"Based on: AMPERE 2014 GEM E3 550": "tam_based_on_AMPERE_2014_GEM_E3_550.csv",
"Based on: AMPERE 2014 IMAGE TIMER 550": "tam_based_on_AMPERE_2014_IMAGE_TIMER_550.csv",
"Based on: Greenpeace 2015 Reference": "tam_based_on_Greenpeace_2015_Reference.csv"
},
"Ambitious Cases": {
"Based on: IEA ETP 2016 2DS": "tam_based_on_IEA_ETP_2016_2DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 450": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_450.csv",
"Based on: AMPERE 2014 GEM E3 450": "tam_based_on_AMPERE_2014_GEM_E3_450.csv",
"Based on: AMPERE 2014 IMAGE TIMER 450": "tam_based_on_AMPERE_2014_IMAGE_TIMER_450.csv",
"Based on: Greenpeace 2015 Energy Revolution": "tam_based_on_Greenpeace_2015_Energy_Revolution.csv"
},
"100% RES2050 Case": {
"Based on: Greenpeace 2015 Advanced Revolution": "tam_based_on_Greenpeace_2015_Advanced_Revolution.csv"
}
},
"Region: USA": {
"Baseline Cases": {
"Based on: IEA ETP 2016 6DS": "tam_based_on_IEA_ETP_2016_6DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO Reference": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_Reference.csv",
"Based on: AMPERE 2014 GEM E3 Reference": "tam_based_on_AMPERE_2014_GEM_E3_Reference.csv",
"Based on: AMPERE 2014 IMAGE TIMER Reference": "tam_based_on_AMPERE_2014_IMAGE_TIMER_Reference.csv"
},
"Conservative Cases": {
"Based on: IEA ETP 2016 4DS": "tam_based_on_IEA_ETP_2016_4DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 550": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_550.csv",
"Based on: AMPERE 2014 GEM E3 550": "tam_based_on_AMPERE_2014_GEM_E3_550.csv",
"Based on: AMPERE 2014 IMAGE TIMER 550": "tam_based_on_AMPERE_2014_IMAGE_TIMER_550.csv",
"Based on: Greenpeace 2015 Reference": "tam_based_on_Greenpeace_2015_Reference.csv"
},
"Ambitious Cases": {
"Based on: IEA ETP 2016 2DS": "tam_based_on_IEA_ETP_2016_2DS.csv",
"Based on: AMPERE 2014 MESSAGE MACRO 450": "tam_based_on_AMPERE_2014_MESSAGE_MACRO_450.csv",
"Based on: AMPERE 2014 GEM E3 450": "tam_based_on_AMPERE_2014_GEM_E3_450.csv",
"Based on: AMPERE 2014 IMAGE TIMER 450": "tam_based_on_AMPERE_2014_IMAGE_TIMER_450.csv",
"Based on: Greenpeace 2015 Energy Revolution": "tam_based_on_Greenpeace_2015_Energy_Revolution.csv"
},
"100% RES2050 Case": {
"Based on: Greenpeace 2015 Advanced Revolution": "tam_based_on_Greenpeace_2015_Advanced_Revolution.csv"
}
}
}
4 changes: 2 additions & 2 deletions solution/biogas/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ def __init__(self, scen=None):
self.initialize_ac(scen, scenarios, PDS2)

# TAM
self._ref_tam_sources = scenario.load_sources(DATADIR/'energy'/'ref_tam_2_sources.json','*')
self._pds_tam_sources = scenario.load_sources(DATADIR/'energy'/'pds_tam_2_sources.json','*')
self._ref_tam_sources = scenario.load_sources(rrs.energy_ref_tam(2),'*')
self._pds_tam_sources = scenario.load_sources(rrs.energy_pds_tam(2),'*')
self.set_tam()
ref_tam_per_region=self.tm.ref_tam_per_region()
pds_tam_per_region=self.tm.pds_tam_per_region()
Expand Down
4 changes: 2 additions & 2 deletions solution/biomass/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,8 +158,8 @@ def __init__(self, scen=None):
self.initialize_ac(scen, scenarios, PDS2)

# TAM
self._ref_tam_sources = scenario.load_sources(DATADIR/'energy'/'ref_tam_2_sources.json','*')
self._pds_tam_sources = scenario.load_sources(DATADIR/'energy'/'pds_tam_2_sources.json','*')
self._ref_tam_sources = scenario.load_sources(rrs.energy_ref_tam(2),'*')
self._pds_tam_sources = scenario.load_sources(rrs.energy_pds_tam(2),'*')
self.set_tam()
ref_tam_per_region=self.tm.ref_tam_per_region()
pds_tam_per_region=self.tm.pds_tam_per_region()
Expand Down
4 changes: 2 additions & 2 deletions solution/concentratedsolar/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ def __init__(self, scen=None):
self.initialize_ac(scen, scenarios, PDS2)

# TAM
self._ref_tam_sources = scenario.load_sources(DATADIR/'energy'/'ref_tam_2_sources.json','*')
self._pds_tam_sources = scenario.load_sources(DATADIR/'energy'/'pds_tam_2_sources.json','*')
self._ref_tam_sources = scenario.load_sources(rrs.energy_ref_tam(2),'*')
self._pds_tam_sources = scenario.load_sources(rrs.energy_pds_tam(2),'*')
self.set_tam()
ref_tam_per_region=self.tm.ref_tam_per_region()
pds_tam_per_region=self.tm.pds_tam_per_region()
Expand Down
4 changes: 2 additions & 2 deletions solution/geothermal/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ def __init__(self, scen=None):
self.initialize_ac(scen, scenarios, PDS2)

# TAM
self._ref_tam_sources = scenario.load_sources(DATADIR/'energy'/'ref_tam_2_sources.json','*')
self._pds_tam_sources = scenario.load_sources(DATADIR/'energy'/'pds_tam_2_sources.json','*')
self._ref_tam_sources = scenario.load_sources(rrs.energy_ref_tam(2),'*')
self._pds_tam_sources = scenario.load_sources(rrs.energy_pds_tam(2),'*')
self.set_tam()
ref_tam_per_region=self.tm.ref_tam_per_region()
pds_tam_per_region=self.tm.pds_tam_per_region()
Expand Down
4 changes: 2 additions & 2 deletions solution/instreamhydro/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,8 @@ def __init__(self, scen=None):
self.initialize_ac(scen, scenarios, PDS2)

# TAM
self._ref_tam_sources = scenario.load_sources(DATADIR/'energy'/'ref_tam_2_sources.json','*')
self._pds_tam_sources = scenario.load_sources(DATADIR/'energy'/'pds_tam_2_sources.json','*')
self._ref_tam_sources = scenario.load_sources(rrs.energy_ref_tam(2),'*')
self._pds_tam_sources = scenario.load_sources(rrs.energy_pds_tam(2),'*')
self.set_tam()
ref_tam_per_region=self.tm.ref_tam_per_region()
pds_tam_per_region=self.tm.pds_tam_per_region()
Expand Down
4 changes: 2 additions & 2 deletions solution/landfillmethane/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ def __init__(self, scen=None):
self.initialize_ac(scen, scenarios, PDS2)

# TAM
self._ref_tam_sources = scenario.load_sources(DATADIR/'energy'/'ref_tam_2_sources.json','*')
self._pds_tam_sources = scenario.load_sources(DATADIR/'energy'/'pds_tam_2_sources.json','*')
self._ref_tam_sources = scenario.load_sources(rrs.energy_ref_tam(2),'*')
self._pds_tam_sources = scenario.load_sources(rrs.energy_pds_tam(2),'*')
self.set_tam()
ref_tam_per_region=self.tm.ref_tam_per_region()
pds_tam_per_region=self.tm.pds_tam_per_region()
Expand Down
Loading

0 comments on commit 0ccff7a

Please sign in to comment.