merge post_integration to validation

os-climate · Aug 26, 2024 · 319382c · 319382c
2 parents 8756ab7 + fc58a75
commit 319382c
Show file tree

Hide file tree

Showing 516 changed files with 2,267 additions and 8,667 deletions.
diff --git a/data_energy/data/invest_in_fossil.csv b/data_energy/data/invest_in_fossil.csv
@@ -1,4 +1,4 @@
-years,FossilSimpleTechno,RenewableSimpleTechno,CarbonCaptureAndStorageTechno
+years,FossilSimpleTechno,CleanEnergySimpleTechno,CarbonCaptureAndStorageTechno
 2019,100,0,0
 2020,100,0,0
 2021,100,0,0

diff --git a/data_energy/data/nze_scenario.csv b/data_energy/data/nze_scenario.csv
@@ -1,4 +1,4 @@
-years,FossilSimpleTechno,RenewableSimpleTechno,CarbonCaptureAndStorageTechno
+years,FossilSimpleTechno,CleanEnergySimpleTechno,CarbonCaptureAndStorageTechno
 2020,39.80075901,59.72485769,0.474383302
 2021,35.55,63.69,0.76
 2022,33.13,66.02,0.85

diff --git a/data_energy/data/scenario_steps.csv b/data_energy/data/scenario_steps.csv
@@ -1,4 +1,4 @@
-years,FossilSimpleTechno,RenewableSimpleTechno,CarbonCaptureAndStorageTechno
+years,FossilSimpleTechno,CleanEnergySimpleTechno,CarbonCaptureAndStorageTechno
 2015,54.95833333,44.75,0.291666667
 2016,49.24242424,50.4456328,0.311942959
 2017,49.51111111,50.17777778,0.311111111

diff --git a/data_energy/techno_age_distrib/anaerobicdigestion.csv b/data_energy/techno_age_distrib/anaerobicdigestion.csv
diff --git a/data_energy/techno_age_distrib/autothermalreforming.csv b/data_energy/techno_age_distrib/autothermalreforming.csv
diff --git a/data_energy/techno_age_distrib/biogasfired.csv b/data_energy/techno_age_distrib/biogasfired.csv
diff --git a/data_energy/techno_age_distrib/biomassfermentation.csv b/data_energy/techno_age_distrib/biomassfermentation.csv
diff --git a/data_energy/techno_age_distrib/biomassfired.csv b/data_energy/techno_age_distrib/biomassfired.csv
diff --git a/data_energy/techno_age_distrib/biomassgasification.csv b/data_energy/techno_age_distrib/biomassgasification.csv
diff --git a/data_energy/techno_age_distrib/chphighheat.csv b/data_energy/techno_age_distrib/chphighheat.csv
diff --git a/data_energy/techno_age_distrib/chplowheat.csv b/data_energy/techno_age_distrib/chplowheat.csv
diff --git a/data_energy/techno_age_distrib/chpmediumheat.csv b/data_energy/techno_age_distrib/chpmediumheat.csv
diff --git a/data_energy/techno_age_distrib/co2hydrogenation.csv b/data_energy/techno_age_distrib/co2hydrogenation.csv
diff --git a/data_energy/techno_age_distrib/coalextraction.csv b/data_energy/techno_age_distrib/coalextraction.csv
diff --git a/data_energy/techno_age_distrib/coalgasification.csv b/data_energy/techno_age_distrib/coalgasification.csv