From e52e48b22bb072c9b8c953ae3ec607c7d4246bd0 Mon Sep 17 00:00:00 2001
From: Wouter <wouter.peters@wur.nl>
Date: Wed, 7 May 2025 11:06:12 +0000
Subject: [PATCH] minor changes to make text and input files consistent for CO2
 practical

---
 EXERCISES/MOGUNTIA-CO2.ipynb | 40 ++++++++++++++++++------------------
 EXERCISES/README.ipynb       |  2 +-
 EXERCISES/fossil.in          | 12 +++++------
 EXERCISES/fossil2.in         | 14 ++++++-------
 4 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/EXERCISES/MOGUNTIA-CO2.ipynb b/EXERCISES/MOGUNTIA-CO2.ipynb
index fa0c1dc..1ad69e0 100755
--- a/EXERCISES/MOGUNTIA-CO2.ipynb
+++ b/EXERCISES/MOGUNTIA-CO2.ipynb
@@ -152,7 +152,6 @@
     "\n",
     "From the net uptake of CO$_2$, e.g. to the oceans, a lifetime can be calculated by dividing the atmospheric burden by the net-uptake. The task is now to test these numbers in MOGUNTIA. For that reason, you must modify the input file in the following way:\n",
     "\n",
-    "> * Extend the simulation period, e.g. to 2000-2008 by inserting the relevant emission data\n",
     "> * Define some stations that can be directly compared to measurements (NOAA ESRL, use **Overplot**)\n",
     "> * Define a correct initial concentration, based on measured atmospheric mole fractions\n",
     "> * Examine **fossil2.in** to see how to use SINK to calculate the uptake by oceans and/or the biosphere\n",
@@ -197,25 +196,6 @@
     "moguntia = pm.plot_moguntia()"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "# reading csv file \n",
-    "import pandas as pd\n",
-    "\n",
-    "df = pd.read_csv(\"annual-co2-emissions-per-country.csv\")\n",
-    "\n",
-    "df = df.set_index(['Entity'])\n",
-    "df = df.loc['World']\n",
-    "df = df.set_index(['Year'])\n",
-    "df['kton C/yr'] = df['Annual CO₂ emissions']/44.*12./1e3 \n",
-    "\n",
-    "df[df.index > 2000]"
-   ]
-  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -262,6 +242,26 @@
     "    \n",
     "</div>    "
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "# reading csv file \n",
+    "import pandas as pd\n",
+    "\n",
+    "df = pd.read_csv(\"https://ourworldindata.org/grapher/annual-co2-emissions-per-country.csv?v=1&csvType=full&useColumnShortNames=false\", storage_options = {'User-Agent': 'Our World In Data data fetch/1.0'})\n",
+    "df = df.set_index(['Entity'])\n",
+    "df = df.loc['World']\n",
+    "df = df.set_index(['Year'])\n",
+    "df['kton C/yr'] = df['Annual CO₂ emissions']/44.*12./1e3 \n",
+    "df['PgC/yr'] = df['Annual CO₂ emissions']/44.*12./1e9\n",
+    "\n",
+    "recent = df[df.index > 1999]\n",
+    "recent['PgC/yr'].plot(color='red',marker='o',lw=2)"
+   ]
   }
  ],
  "metadata": {
diff --git a/EXERCISES/README.ipynb b/EXERCISES/README.ipynb
index 2bde179..557faf7 100644
--- a/EXERCISES/README.ipynb
+++ b/EXERCISES/README.ipynb
@@ -34,7 +34,7 @@
     "\n",
     "* [15:00-15:45] We start with the [the MOGUNTIA Ocean Notebook](./MOGUNTIA-Ocean.ipynb) that uses a tracer released from the ocean surface to teach students the basics on how to work with the MOGUNTIA model inputs and outputs\n",
     "\n",
-    "* [16:00-17:00] [the MOGUNTIA interhemispheric transport Notebook](./MOGUNTIA-iht.ipynb) in which we will try to calculate the exchange time between the two hemispheres using an artifical tracer released in MOGUNTIA\n",
+    "* [16:00-17:00] [the MOGUNTIA interhemispheric transport Notebook](./MOGUNTIA-iht.ipynb) in which we will try to calculate the exchange time between the two hemispheres using an artificial tracer released in MOGUNTIA\n",
     "\n",
     "\n",
     "#### Saturday May 10th (transport practical part 2): \n",
diff --git a/EXERCISES/fossil.in b/EXERCISES/fossil.in
index 448527d..606b4e8 100755
--- a/EXERCISES/fossil.in
+++ b/EXERCISES/fossil.in
@@ -23,15 +23,15 @@ EMISSION DISTRIBUTION emission_dist_co2.dat 11
 STATION_OUTPUT MONTHLY
 STATION Mauna_Loa      19N 156W
 STATION Mace_Head      53N 11W
-STATION Barbados       13N 59W
-STATION Samoa          14S 171W
+ STATION Barbados       13N 59W
+ STATION Samoa          14S 171W
 STATION Cape_Grim      41S 145E
 STATION South_Pole     90S 25W
 STATION Alert          82N 63W
-STATION Ny_Alesund     79N 12E
-STATION Hyytiala       62N 24E
-STATION Crozet_Island  46S 52E
-STATION Trinidad_Head  45N 124W
+ STATION Ny_Alesund     79N 12E
+ STATION Hyytiala       62N 24E
+ STATION Crozet_Island  46S 52E
+ STATION Trinidad_Head  45N 124W
 OUTPUT MONTHLY LATLON 1000HPA
 OUTPUT MONTHLY ZONAL_AVERAGE
 END
diff --git a/EXERCISES/fossil2.in b/EXERCISES/fossil2.in
index 545fdac..296d533 100755
--- a/EXERCISES/fossil2.in
+++ b/EXERCISES/fossil2.in
@@ -28,22 +28,22 @@ EMISSION DISTRIBUTION emission_dist_co2.dat 11
    SINK FILE co2_sink_bio.dat   (space as first character means: not read)
    SINK FILE co2_sink_ocbio.dat   (space as first character means: not read)
 
-   The new option EXTRA_LAND calculates extra land sink of 1.0 PgC/year
+   The option EXTRA_LAND provides an extra land sink of a given size (1.0 PgC/year)
    
    SINK EXTRA_LAND 1.0
 
 STATION_OUTPUT MONTHLY
 STATION Mauna_Loa      19N 156W
 STATION Mace_Head      53N 11W
-STATION Barbados       13N 59W
-STATION Samoa          14S 171W
+ STATION Barbados       13N 59W
+ STATION Samoa          14S 171W
 STATION Cape_Grim      41S 145E
 STATION South_Pole     90S 25W
 STATION Alert          82N 63W
-STATION Ny_Alesund     79N 12E
-STATION Hyytiala       62N 24E
-STATION Crozet_Island  46S 52E
-STATION Trinidad_Head  45N 124W
+ STATION Ny_Alesund     79N 12E
+ STATION Hyytiala       62N 24E
+ STATION Crozet_Island  46S 52E
+ STATION Trinidad_Head  45N 124W
 OUTPUT MONTHLY LATLON 1000HPA
 OUTPUT MONTHLY ZONAL_AVERAGE
 END
-- 
GitLab