Fix/structure final-draft edits

notebooks/makedata.ipynb

@@ -15,7 +15,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Make data for worksheet 2b"
+    "# Make data for worksheet 4"
    ]
   },
   {
@@ -49,14 +49,16 @@
     "    for cube in tempcubelist:\n",
     "        if cube.name() == 'air_temperature':\n",
     "            cube.convert_units('celsius')\n",
-    "            outpath = os.path.join(datadir, 'netcdf', runid, runid + '.pm.2021_2050.tm.norim.K.nc')\n",
+    "            outpath = oimport glob\n",
+    "import os\n",
+    "import iriss.path.join(datadir, 'future', runid + '.mon.2021_2050.tm.rr.C.nc')\n",
     "            cube.remove_coord('forecast_period')\n",
     "            cube.remove_coord('forecast_reference_time')\n",
     "            iris.save(cube, outpath)\n",
     "        if cube.name() == 'precipitation_flux':\n",
     "            cube.convert_units('kg m-2 day-1')\n",
     "            cube.units = 'mm day-1'\n",
-    "            outpath = os.path.join(datadir, 'netcdf', runid, runid + '.pm.2021_2050.pr.norim.mmday-1.nc')\n",
+    "            outpath = os.path.join(datadir, 'future', runid + '.mon.2021_2050.pr.rr.mmday-1.nc')\n",
     "            cube.remove_coord('forecast_period')\n",
     "            cube.remove_coord('forecast_reference_time')\n",
     "            iris.save(cube, outpath)"
@@ -68,15 +70,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Prep baseline data (1981-1983) from pp files\n",
+    "# Prep baseline data (1961-1990) from pp files\n",
     "datadir = '/project/precis/worksheets/data'\n",
     "\n",
     "# Make baseline data\n",
     "for runid in ['cahpa', 'cahpb']:\n",
     "    ppdir = os.path.join(datadir, 'pp', runid)\n",
     "\n",
     "    # find all the files from which to remove the rim\n",
-    "    flist = glob.glob(ppdir + '/*pmi*.pp')\n",
+    "    flist = glob.glob(ppdir + '/*pm[ghij]*.pp')\n",
     "    \n",
     "    datacubes = iris.load(flist)\n",
     "    tempcubelist = []\n",
@@ -92,7 +94,8 @@
     "    \n",
     "    for cube in tempcubelist:\n",
     "        if cube.name() == 'air_temperature':\n",
-    "            outpath = os.path.join(datadir, 'netcdf', runid, runid + '.pm.1981_1983.tm.norim.K.nc')\n",
+    "            cube.convert_units('celsius')\n",
+    "            outpath = os.path.join(datadir, 'historical', runid + '.mon.1961_1990.tm.rr.C.nc')\n",
     "            cube.remove_coord('forecast_period')\n",
     "            cube.remove_coord('forecast_reference_time')\n",
     "            iris.save(cube, outpath)\n",
@@ -104,14 +107,20 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "# Make data for Worksheet 3"
+    "# Make data for Worksheet 5"
    ]
   },
   {
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "Note that these datasets should be saved with compression to reduce their file size.  If for some reason this needs to be done during a PRECIS course, it is quicker to save them without compression using `iris.save(cube, outfile)` but the filesize is significantly larger."
+    "Note that these datasets should be saved with compression to reduce their file size.  If for some reason this needs to be done during a PRECIS course, it is quicker to save them without compression using `iris.save(cube, outfile)` but the filesize is significantly larger.\n",
+    "\n",
+    "Use: `/project/precis/worksheets/data/pp/wks5dataprep.py`\n",
+    "\n",
+    "And: `~hsteptoe/batch/py_makeprecis.py`\n",
+    "\n",
+    "Then `nccopy -k nc4 -d 4 -s <infile> <outfile>`"
    ]
   },
   {
@@ -145,20 +154,22 @@
     "    \n",
     "    for cube in tempcubelist:\n",
     "        if cube.name() == 'air_temperature' and cube.cell_methods[0].method == 'mean':\n",
+    "            outpath = os.path.join(datadir, 'future', runid + '.day.2021_2050.tm.rr.C.nc')\n",
     "            cube.convert_units('celsius')\n",
-    "            outpath = os.path.join(datadir, 'netcdf', runid, runid + '.pa.2021_2050.tm.norim.K.nc')\n",
     "            cube.remove_coord('forecast_period')\n",
     "            cube.remove_coord('forecast_reference_time')\n",
-    "            iris.fileformats.netcdf.save(cube, outpath, least_significant_digit=3,\n",
-    "                                 netcdf_format='NETCDF4', complevel=4, zlib=True)\n",
+    "#             iris.fileformats.netcdf.save(cube, outpath, least_significant_digit=3,\n",
+    "#                                  netcdf_format='NETCDF4', complevel=4, zlib=True)\n",
+    "            iris.save(cube, outpath)\n",
     "        elif cube.name() == 'precipitation_flux':\n",
     "            cube.convert_units('kg m-2 day-1')\n",
     "            cube.units = 'mm day-1'\n",
-    "            outpath = os.path.join(datadir, 'netcdf', runid, runid + '.pa.2021_2050.pr.norim.mmday-1.nc')\n",
+    "            outpath = os.path.join(datadir, 'future', runid + '.day.2021_2050.pr.rr.mmday-1.nc')\n",
     "            cube.remove_coord('forecast_period')\n",
     "            cube.remove_coord('forecast_reference_time')\n",
-    "            iris.fileformats.netcdf.save(cube, outpath, least_significant_digit=3,\n",
-    "                                 netcdf_format='NETCDF4', complevel=4, zlib=True)\n",
+    "#             iris.fileformats.netcdf.save(cube, outpath, least_significant_digit=3,\n",
+    "#                                  netcdf_format='NETCDF4', complevel=4, zlib=True)\n",
+    "            iris.save(cube, outpath)\n",
     "        else:\n",
     "            pass"
    ]
@@ -169,15 +180,15 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Prep baseline data (1981-1983) from pp files\n",
+    "# Prep baseline data (1961-1990) from pp files\n",
     "datadir = '/project/precis/worksheets/data'\n",
     "\n",
     "# Make baseline data\n",
     "for runid in ['cahpa', 'cahpb']:\n",
     "    ppdir = os.path.join(datadir, 'pp', runid)\n",
     "\n",
     "    # find all the files from which to remove the rim\n",
-    "    flist = glob.glob(ppdir + '/*pai*.pp')\n",
+    "    flist = glob.glob(ppdir + '/*pa[ghij]*.pp')\n",
     "    \n",
     "    datacubes = iris.load(flist)\n",
     "    tempcubelist = []\n",
@@ -193,19 +204,22 @@
     "    \n",
     "    for cube in tempcubelist:\n",
     "        if cube.name() == 'air_temperature' and cube.cell_methods[0].method == 'mean':\n",
-    "            outpath = os.path.join(datadir, 'netcdf', runid, runid + '.pa.1981_1983.tm.norim.K.nc')\n",
+    "            cube.convert_units('celsius')\n",
+    "            outpath = os.path.join(datadir, 'historical', runid + '.day.1961_1990.tm.rr.C.nc')\n",
     "            cube.remove_coord('forecast_period')\n",
     "            cube.remove_coord('forecast_reference_time')\n",
-    "            iris.fileformats.netcdf.save(cube, outpath, least_significant_digit=3,\n",
-    "                                 netcdf_format='NETCDF4', complevel=4, zlib=True)\n",
+    "#             iris.fileformats.netcdf.save(cube, outpath, least_significant_digit=3,\n",
+    "#                                  netcdf_format='NETCDF4', complevel=4, zlib=True)\n",
+    "            iris.save(cube, outpath)\n",
     "        if cube.name() == 'precipitation_flux':\n",
     "            cube.convert_units('kg m-2 day-1')\n",
     "            cube.units = 'mm day-1'\n",
-    "            outpath = os.path.join(datadir, 'netcdf', runid, runid + '.pa.1981_1983.pr.norim.mmday-1.nc')\n",
+    "            outpath = os.path.join(datadir, 'historical', runid + '.day.1961_1990.pr.rr.mmday-1.nc')\n",
     "            cube.remove_coord('forecast_period')\n",
     "            cube.remove_coord('forecast_reference_time')\n",
-    "            iris.fileformats.netcdf.save(cube, outpath, least_significant_digit=3,\n",
-    "                                 netcdf_format='NETCDF4', complevel=4, zlib=True)"
+    "#             iris.fileformats.netcdf.save(cube, outpath, least_significant_digit=3,\n",
+    "#                                  netcdf_format='NETCDF4', complevel=4, zlib=True)\n",
+    "            iris.save(cube, outpath)"
    ]
   }
  ],