model_wetdays in correct place - period loop

MetOffice · Aug 5, 2022 · 72fed13 · 72fed13
1 parent ab0d48b
commit 72fed13
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/notebooks/worksheet5.ipynb b/notebooks/worksheet5.ipynb
@@ -143,17 +143,16 @@
     "# To learn more about custom aggregators see\n",
     "# https://scitools.org.uk/iris/docs/v2.4.0/examples/General/custom_aggregation.html#general-custom-aggregation \n",
     "\n",
-    "# count wet days \n",
-    "model_wetdays = data.collapsed('time', iris.analysis.COUNT,\n",
-    "                        function=lambda values: values > 1)\n",
     "\n",
     "for gcmid in GCMIDS:\n",
     "    for period in TIME_PERIODS.keys():\n",
     "        # Get path to daily data\n",
     "        infile = os.path.join(DATADIR, period, gcmid + '.day.' + TIME_PERIODS[period] + '.GERICS-REMO2015.pr.*.nc')\n",
     "        data = iris.load_cube(infile)\n",
-    "        # Select only wet days using our custom aggregator\n",
-    "        model_wetdays = data.collapsed('time', count_nonzero)\n",
+    "        \n",
+    "        # Count wet days \n",
+    "        model_wetdays = data.collapsed('time', iris.analysis.COUNT,\n",
+    "                                       function=lambda values: values > 1)\n",
     "        model_wetdays.rename(f'{gcmid} number of wet days (>=1mm/day) {TIME_PERIODS[period]}')\n",
     "        # Save the file\n",
     "        outfile = os.path.join(CLIMDIR, gcmid + '.day.' + TIME_PERIODS[period] + '.GERICS-REMO2015.wetday.nc')\n",
@@ -166,7 +165,6 @@
     "        # Add metadata\n",
     "        model_pcent_wetdays.rename(f'{gcmid} percentage of wet days (>=1mm/day) {TIME_PERIODS[period]}')\n",
     "        model_pcent_wetdays.units = '%'\n",
-    "\n",
     "        # Save the file\n",
     "        outfile = os.path.join(CLIMDIR, gcmid + '.day.' + TIME_PERIODS[period] + '.GERICS-REMO2015.wetday.pcent.nc')\n",
     "        iris.save(model_pcent_wetdays, outfile)\n",