Merge branch 'develop' into integration

os-climate · Aug 16, 2024 · 6e2c6d7 · 6e2c6d7
2 parents bac9351 + 991fc1a
commit 6e2c6d7
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 0 deletions.
diff --git a/data_energy/techno_factories_age/carbonstoragetechno.csv b/data_energy/techno_factories_age/carbonstoragetechno.csv
@@ -1,3 +1,4 @@
 years,growth_rate
+2023,1.0
 2020,1.0
 1987,1.0
diff --git a/data_energy/techno_factories_age/direct_air_capture_directaircapturetechno.csv b/data_energy/techno_factories_age/direct_air_capture_directaircapturetechno.csv
@@ -1,3 +1,4 @@
 years,growth_rate
+2023,1.0
 2020,1.0
 1987,1.0
diff --git a/data_energy/techno_factories_age/flue_gas_capture_fluegastechno.csv b/data_energy/techno_factories_age/flue_gas_capture_fluegastechno.csv
@@ -1,3 +1,4 @@
 years,growth_rate
+2023,1.0
 2020,1.0
 1997,1.0
diff --git a/data_energy/techno_factories_age/fossilsimpletechno.csv b/data_energy/techno_factories_age/fossilsimpletechno.csv
@@ -1,3 +1,4 @@
 years,growth_rate
+2023,1.0
 2020,1.0
 1996,1.0
diff --git a/data_energy/techno_factories_age/renewablesimpletechno.csv b/data_energy/techno_factories_age/renewablesimpletechno.csv
@@ -1,3 +1,4 @@
 years,growth_rate
+2023,1.0
 2020,1.0
 1991,1.0
diff --git a/data_energy/techno_invests/direct_air_capture_directaircapturetechno.csv b/data_energy/techno_invests/direct_air_capture_directaircapturetechno.csv
@@ -2,3 +2,8 @@ years,past years,invest
 2017,-3,1.3581333333333335e-05
 2018,-2,1.3581333333333335e-05
 2019,-1,0.0040248
+2019,-1,0.0040248
+2020,-1,0
+2021,-1,0.0040248
+2022,-1,1.0
+2024,-1,0.0218
diff --git a/data_energy/techno_invests/flue_gas_capture_fluegastechno.csv b/data_energy/techno_invests/flue_gas_capture_fluegastechno.csv
@@ -1,2 +1,3 @@
 years,past years,invest
 2019,-1,0.2
+2023,-1,0.0
diff --git a/data_energy/techno_invests/sources.txt b/data_energy/techno_invests/sources.txt
@@ -1,3 +1,4 @@
 FossilSimpleTechno : https://www.iea.org/reports/world-energy-investment-2023/overview-and-key-findings
 RenewableSimpleTechno : https://www.iea.org/reports/world-energy-investment-2023/overview-and-key-findings
 CarbonStorageTechno : https://www.iea.org/energy-system/carbon-capture-utilisation-and-storage/co2-capture-and-utilisation
+DirectAirCaptureTechno : https://www.iea.org/energy-system/carbon-capture-utilisation-and-storage/direct-air-capture