update afforestation model

Note afforestation still has a key result error, but the error is arguably justified. We need to either add the ability to skip specific key results, or fix the larger issue (Issue #517)
ProjectDrawdown · Dec 22, 2021 · ef47615 · ef47615
1 parent f40034c
commit ef47615
Show file tree

Hide file tree

Showing 37 changed files with 774 additions and 739 deletions.
diff --git a/solution/afforestation/__init__.py b/solution/afforestation/__init__.py
diff --git a/solution/afforestation/ac/PDS-65p2050-Drawdown-CustomPDS-high05stdv-Jan2020.json b/solution/afforestation/ac/PDS-65p2050-Drawdown-CustomPDS-high05stdv-Jan2020.json
diff --git a/...050-Plausible-cusomPDS-avg-30Jan2020.json → ...on/ac/PDS_57p2050_Plausible_30d7e83c.json b/...050-Plausible-cusomPDS-avg-30Jan2020.json → ...on/ac/PDS_57p2050_Plausible_30d7e83c.json
@@ -2,10 +2,12 @@
     "name": "PDS-57p2050-Plausible-cusomPDS-avg-30Jan2020",
     "solution_category": "land",
     "vmas": "VMAs",
+    "creation_date": "2020-01-30 18:13:34",
     "description": "updated results with corrected operational cost",
     "report_start_year": 2020,
     "report_end_year": 2050,
     "use_custom_tla": true,
+    "custom_tla_fixed_value": 717.9727216437761,
     "ref_base_adoption": {
         "World": 294.140179643776,
         "OECD90": 98.4921217873836,
@@ -33,23 +35,18 @@
         "USA": 0.0
     },
     "soln_pds_adoption_custom_name": "Average of All Custom Scenarios",
+    "soln_pds_adoption_scenarios_included": [],
     "soln_ref_adoption_basis": "Custom",
     "soln_ref_adoption_custom_name": "Average of All Custom Scenarios",
     "soln_ref_adoption_regional_data": false,
-    "conv_2014_cost": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "conv_2014_cost": 0.0,
     "conv_first_cost_efficiency_rate": 0.0,
     "conv_fixed_oper_cost_per_iunit": {
         "value": 80.6395203234038,
         "xls cell formula": "C80*$G$205"
     },
     "conv_expected_lifetime": 0.0,
-    "yield_from_conv_practice": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "yield_from_conv_practice": 0.0,
     "pds_2014_cost": {
         "value": 668.570880189175,
         "statistic": "mean"
@@ -64,10 +61,7 @@
         "statistic": "mean"
     },
     "soln_expected_lifetime": 26.0,
-    "yield_gain_from_conv_to_soln": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "yield_gain_from_conv_to_soln": 0.0,
     "npv_discount_rate": 0.1,
     "emissions_use_co2eq": true,
     "emissions_use_agg_co2eq": true,
@@ -80,20 +74,11 @@
         "statistic": "mean"
     },
     "tco2eq_rplu_rate": "Annual",
-    "tco2_reduced_per_land_unit": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "tco2_reduced_per_land_unit": 0.0,
     "tco2_rplu_rate": "One-time",
-    "tn2o_co2_reduced_per_land_unit": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "tn2o_co2_reduced_per_land_unit": 0.0,
     "tn2o_co2_rplu_rate": "One-time",
-    "tch4_co2_reduced_per_land_unit": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "tch4_co2_reduced_per_land_unit": 0.0,
     "tch4_co2_rplu_rate": "One-time",
     "land_annual_emissons_lifetime": 100.0,
     "conv_annual_energy_used": 0.0,
@@ -106,10 +91,6 @@
         "value": 64.8575257352941,
         "statistic": "mean"
     },
-    "disturbance_rate": {
-        "value": 0.0,
-        "statistic": ""
-    },
-    "harvest_frequency": 26.0,
-    "creation_date": "2020-01-30 18:13:34"
+    "disturbance_rate": 0.0,
+    "harvest_frequency": 26.0
 }
diff --git a/...65p2050-drawdown-customPDS-30Jan2020.json → ...on/ac/PDS_65p2050_drawdown__b55a8d19.json b/...65p2050-drawdown-customPDS-30Jan2020.json → ...on/ac/PDS_65p2050_drawdown__b55a8d19.json
@@ -2,10 +2,12 @@
     "name": "PDS-65p2050-drawdown-customPDS-30Jan2020",
     "solution_category": "land",
     "vmas": "VMAs",
+    "creation_date": "2020-01-30 18:14:12",
     "description": "updated results with corrected operational cost",
     "report_start_year": 2020,
     "report_end_year": 2050,
     "use_custom_tla": true,
+    "custom_tla_fixed_value": 717.9727216437761,
     "ref_base_adoption": {
         "World": 294.140179643776,
         "OECD90": 98.4921217873836,
@@ -33,23 +35,18 @@
         "USA": 0.0
     },
     "soln_pds_adoption_custom_name": "High of All Custom Scenarios",
+    "soln_pds_adoption_scenarios_included": [],
     "soln_ref_adoption_basis": "Custom",
     "soln_ref_adoption_custom_name": "Average of All Custom Scenarios",
     "soln_ref_adoption_regional_data": false,
-    "conv_2014_cost": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "conv_2014_cost": 0.0,
     "conv_first_cost_efficiency_rate": 0.0,
     "conv_fixed_oper_cost_per_iunit": {
         "value": 80.6395203234038,
         "xls cell formula": "C80*$G$205"
     },
     "conv_expected_lifetime": 0.0,
-    "yield_from_conv_practice": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "yield_from_conv_practice": 0.0,
     "pds_2014_cost": {
         "value": 668.570880189175,
         "statistic": "mean"
@@ -64,10 +61,7 @@
         "statistic": "mean"
     },
     "soln_expected_lifetime": 26.0,
-    "yield_gain_from_conv_to_soln": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "yield_gain_from_conv_to_soln": 0.0,
     "npv_discount_rate": 0.1,
     "emissions_use_co2eq": true,
     "emissions_use_agg_co2eq": true,
@@ -80,20 +74,11 @@
         "statistic": "mean"
     },
     "tco2eq_rplu_rate": "Annual",
-    "tco2_reduced_per_land_unit": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "tco2_reduced_per_land_unit": 0.0,
     "tco2_rplu_rate": "One-time",
-    "tn2o_co2_reduced_per_land_unit": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "tn2o_co2_reduced_per_land_unit": 0.0,
     "tn2o_co2_rplu_rate": "One-time",
-    "tch4_co2_reduced_per_land_unit": {
-        "value": 0.0,
-        "statistic": ""
-    },
+    "tch4_co2_reduced_per_land_unit": 0.0,
     "tch4_co2_rplu_rate": "One-time",
     "land_annual_emissons_lifetime": 100.0,
     "conv_annual_energy_used": 0.0,
@@ -106,10 +91,6 @@
         "value": 64.8575257352941,
         "statistic": "mean"
     },
-    "disturbance_rate": {
-        "value": 0.0,
-        "statistic": ""
-    },
-    "harvest_frequency": 26.0,
-    "creation_date": "2020-01-30 18:14:12"
+    "disturbance_rate": 0.0,
+    "harvest_frequency": 26.0
 }
diff --git a/solution/afforestation/ad/ad_sources.json b/solution/afforestation/ad/ad_sources.json
@@ -1,5 +1,5 @@
 {
-  "Raw Data for ALL LAND TYPES": {
-    "FAO 2015": "ad_FAO_2015.csv"
-  }
+    "Raw Data for ALL LAND TYPES": {
+        "FAO 2015": "ad_FAO_2015.csv"
+    }
 }
diff --git a/...afforestation_rate_across_the_regions.csv → ..._data/ca_pds_100_of_the_max__e1b0a8dd.csv b/...afforestation_rate_across_the_regions.csv → ..._data/ca_pds_100_of_the_max__e1b0a8dd.csv
diff --git a/...or_Asia_and_100_for_the_other_regions.csv → ..._data/ca_pds_200_increase_fo_92fe11c9.csv b/...or_Asia_and_100_for_the_other_regions.csv → ..._data/ca_pds_200_increase_fo_92fe11c9.csv
diff --git a/...afforestation_rate_across_the_regions.csv → ..._data/ca_pds_50_of_the_max_h_056a1704.csv b/...afforestation_rate_across_the_regions.csv → ..._data/ca_pds_50_of_the_max_h_056a1704.csv
diff --git a/solution/afforestation/ca_pds_data/ca_pds_Conservative_gr_b187395c.csv b/solution/afforestation/ca_pds_data/ca_pds_Conservative_gr_b187395c.csv
@@ -0,0 +1,50 @@
+Year,World,OECD90,Eastern Europe,Asia (Sans Japan),Middle East and Africa,Latin America,China,India,EU,USA
+2012,,,,,,,,,,
+2013,,,,,,,,,,
+2014,290.4623363066917,98.17833300038109,44.55581960428179,113.78907638250794,17.42594501697486,16.51316230254609,,,,
+2015,291.3365504164047,98.25420116408779,44.581222727228734,114.37817435974941,17.491860832197403,16.631091333141406,,,,
+2016,292.24091274178653,98.33178661089971,44.60732854920579,114.9886032969614,17.56005055093059,16.753143733789074,,,,
+2017,293.17544768389206,98.41109244920295,44.63413809078228,115.62038082799879,17.63051544580534,16.879320870102738,,,,
+2018,294.1401796437762,98.49212178738358,44.661652372527556,116.27352458671648,17.703256789452578,17.00962410769603,,,,
+2019,317.00996002004104,,,,,,,,,
+2020,321.5839160952928,,,,,,,,,
+2021,326.1578721705464,,,,,,,,,
+2022,330.7318282458,,,,,,,,,
+2023,335.30578432105176,,,,,,,,,
+2024,339.87974039630535,,,,,,,,,
+2025,344.4536964715571,,,,,,,,,
+2026,349.0276525468107,,,,,,,,,
+2027,353.6016086220643,,,,,,,,,
+2028,358.1755646973161,,,,,,,,,
+2029,362.74952077256967,,,,,,,,,
+2030,363.75725617666933,,,,,,,,,
+2031,363.75725617666933,,,,,,,,,
+2032,363.75725617666933,,,,,,,,,
+2033,363.75725617666933,,,,,,,,,
+2034,363.75725617666933,,,,,,,,,
+2035,363.75725617666933,,,,,,,,,
+2036,363.75725617666933,,,,,,,,,
+2037,363.75725617666933,,,,,,,,,
+2038,363.75725617666933,,,,,,,,,
+2039,363.75725617666933,,,,,,,,,
+2040,363.75725617666933,,,,,,,,,
+2041,363.75725617666933,,,,,,,,,
+2042,363.75725617666933,,,,,,,,,
+2043,363.75725617666933,,,,,,,,,
+2044,363.75725617666933,,,,,,,,,
+2045,363.75725617666933,,,,,,,,,
+2046,363.75725617666933,,,,,,,,,
+2047,363.75725617666933,,,,,,,,,
+2048,363.75725617666933,,,,,,,,,
+2049,363.75725617666933,,,,,,,,,
+2050,363.75725617666933,,,,,,,,,
+2051,363.75725617666933,,,,,,,,,
+2052,363.75725617666933,,,,,,,,,
+2053,363.75725617666933,,,,,,,,,
+2054,363.75725617666933,,,,,,,,,
+2055,363.75725617666933,,,,,,,,,
+2056,363.75725617666933,,,,,,,,,
+2057,363.75725617666933,,,,,,,,,
+2058,363.75725617666933,,,,,,,,,
+2059,363.75725617666933,,,,,,,,,
+2060,363.75725617666933,,,,,,,,,