Update after settling on 50 % biofuel.

florianjehn · Nov 28, 2023 · 2abd32d · 2abd32d
1 parent 3b4450f
commit 2abd32d
Show file tree

Hide file tree

Showing 40 changed files with 73,448 additions and 73,350 deletions.
diff --git a/results/global/150tg/area.png b/results/global/150tg/area.png
diff --git a/results/global/150tg/food_satisfaction.csv b/results/global/150tg/food_satisfaction.csv
diff --git a/results/global/150tg/food_satisfaction.png b/results/global/150tg/food_satisfaction.png
diff --git a/results/global/150tg/harvest_df_cluster_1.csv b/results/global/150tg/harvest_df_cluster_1.csv
diff --git a/results/global/150tg/harvest_df_cluster_3.csv b/results/global/150tg/harvest_df_cluster_3.csv
diff --git a/results/global/16tg/area.png b/results/global/16tg/area.png
diff --git a/results/global/16tg/food_satisfaction.csv b/results/global/16tg/food_satisfaction.csv
diff --git a/results/global/16tg/food_satisfaction.png b/results/global/16tg/food_satisfaction.png
diff --git a/results/global/16tg/harvest_df_cluster_1.csv b/results/global/16tg/harvest_df_cluster_1.csv
diff --git a/results/global/16tg/harvest_df_cluster_3.csv b/results/global/16tg/harvest_df_cluster_3.csv
diff --git a/results/global/27tg/area.png b/results/global/27tg/area.png
diff --git a/results/global/27tg/food_satisfaction.csv b/results/global/27tg/food_satisfaction.csv
diff --git a/results/global/27tg/food_satisfaction.png b/results/global/27tg/food_satisfaction.png
diff --git a/results/global/27tg/harvest_df_cluster_2.csv b/results/global/27tg/harvest_df_cluster_2.csv
diff --git a/results/global/27tg/harvest_df_cluster_3.csv b/results/global/27tg/harvest_df_cluster_3.csv
diff --git a/results/global/37tg/area.png b/results/global/37tg/area.png
diff --git a/results/global/37tg/food_satisfaction.csv b/results/global/37tg/food_satisfaction.csv
diff --git a/results/global/37tg/food_satisfaction.png b/results/global/37tg/food_satisfaction.png
diff --git a/results/global/37tg/harvest_df_cluster_2.csv b/results/global/37tg/harvest_df_cluster_2.csv
diff --git a/results/global/37tg/harvest_df_cluster_3.csv b/results/global/37tg/harvest_df_cluster_3.csv
diff --git a/results/global/47tg/area.png b/results/global/47tg/area.png
diff --git a/results/global/47tg/food_satisfaction.csv b/results/global/47tg/food_satisfaction.csv
diff --git a/results/global/47tg/food_satisfaction.png b/results/global/47tg/food_satisfaction.png
diff --git a/results/global/47tg/harvest_df_cluster_2.csv b/results/global/47tg/harvest_df_cluster_2.csv
diff --git a/results/global/47tg/harvest_df_cluster_3.csv b/results/global/47tg/harvest_df_cluster_3.csv
diff --git a/results/global/5tg/area.png b/results/global/5tg/area.png
diff --git a/results/global/5tg/food_satisfaction.csv b/results/global/5tg/food_satisfaction.csv
diff --git a/results/global/5tg/food_satisfaction.png b/results/global/5tg/food_satisfaction.png
diff --git a/results/global/5tg/harvest_df_cluster_2.csv b/results/global/5tg/harvest_df_cluster_2.csv
diff --git a/results/global/5tg/harvest_df_cluster_3.csv b/results/global/5tg/harvest_df_cluster_3.csv
diff --git a/results/global/control/area.png b/results/global/control/area.png
diff --git a/results/global/control/food_satisfaction.csv b/results/global/control/food_satisfaction.csv
diff --git a/results/global/control/food_satisfaction.png b/results/global/control/food_satisfaction.png
diff --git a/results/global/control/harvest_df_cluster_1.csv b/results/global/control/harvest_df_cluster_1.csv
diff --git a/results/global/control/harvest_df_cluster_2.csv b/results/global/control/harvest_df_cluster_2.csv
diff --git a/results/global/scenario_comparison.png b/results/global/scenario_comparison.png
diff --git a/scripts/Efficieny.ipynb b/scripts/Efficieny.ipynb
@@ -17,20 +17,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Productivity per year per km2 (wet): 30575 tons\n"
+      "Productivity per year per km2 (wet): 8101 tons\n"
      ]
     }
    ],
    "source": [
     "# This is based on the model output in the global.ipynb notebook\n",
-    "productivity_ton_day_km2 = 83.76813026520479 # tons/day/km2\n",
+    "productivity_ton_day_km2 = 22.195436639423015 # tons/day/km2\n",
     "days_per_year = 365\n",
     "productivity_ton_year_km2_wet = productivity_ton_day_km2 * days_per_year\n",
     "print(\"Productivity per year per km2 (wet): \" + str(int(productivity_ton_year_km2_wet)) + \" tons\")"
@@ -45,15 +45,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Productivity per year per km2 (dry): 3363 tons\n",
-      "Productivity per year per hectar (dry): 33.63 tons\n",
+      "Productivity per year per km2 (dry): 891 tons\n",
+      "Productivity per year per hectar (dry): 8.91 tons\n",
       "Calories per ton (dry): 2620000 kcal\n",
       "Calories per ton (wet): 288200 kcal\n"
      ]
@@ -87,14 +87,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 15,
+   "execution_count": 3,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Total watts per year per km2 (wet): 36868658758516\n"
+      "Total watts per year per km2 (wet): 9768822305862\n"
      ]
     }
    ],
@@ -118,7 +118,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 16,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [
     {
@@ -155,14 +155,14 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 17,
+   "execution_count": 5,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "Efficiency: 10.676689497287288\n"
+      "Efficiency: 2.8289253264408387\n"
      ]
     }
    ],