2113 nimrod regrid

src/CSET/cset_workflow/app/fetch_nimrod/bin/fetch_nimrod.py

@@ -5,7 +5,7 @@
 import json
 import logging
 import os
-from datetime import datetime
+from datetime import datetime, timedelta
 from pathlib import Path
 
 import iris
@@ -101,10 +101,6 @@ def retrieve_nimrod():
     with open(nimrod_met_office, "rt") as fp:  # pragma: no cover
         nimrod_dict = json.load(fp)
 
-    # Form the Nimrod start and end dates.
-    date_start = v["data_time"]
-    date_end = v["data_time"] + v["forecast_length"]
-
     # Loop over the required Nimrod fields, i.e. 1km 2km or xkm rainfall
     # accumulation composites or the 5 minute rainfall rate composites.
     for nimrod_field in v["field"]:
@@ -124,9 +120,21 @@ def retrieve_nimrod():
                 os.makedirs(nimrod_dir_wei, exist_ok=True)
                 logger.info("Cylc-run Nimrod weights directory: %s", nimrod_dir_wei)
 
+            # Put +1 hour offset for accumulation radar files as
+            # the time stamps for these files mark the end of the
+            # accumulation period rather than the beginning.
+            radar_offset = timedelta(hours=0.0)
+            if nimrod_field == "Nimrod_comp_xkm":
+                radar_offset = timedelta(hours=1.0)
+            if nimrod_field == "Nimrod_comp_1km":
+                radar_offset = timedelta(hours=1.0)
+            if nimrod_field == "Nimrod_comp_2km":
+                radar_offset = timedelta(hours=1.0)
+            date_start_offset = v["data_time"] + radar_offset
+
             # Process Nimrod data between the start and end dates.
-            date_use = date_start
-            while date_use <= date_end:
+            date_use = date_start_offset
+            while date_use < date_start_offset + v["forecast_length"]:
                 # Load the Nimrod data into an Iris cube.
                 nimrod_obs_exist = "False"
                 nimrod_obs = (

src/CSET/cset_workflow/meta/observations/rose-meta.conf

@@ -223,8 +223,8 @@ title=Radar observations
 
 [template variables=NIMROD_COMP_XKM]
 ns=Observations/Radar
-title=UK Nimrod radar accumulated rainfall
-description=Default UK Nimrod rainfall accumulation
+title=UK Nimrod radar accumulated rainfall 5km gridding
+description=5km gridded UK Nimrod rainfall accumulation
 help=Switch to select default gridded UK Nimrod rainfall accumulation.
 compulsory=true
 type=python_boolean
@@ -269,6 +269,31 @@ compulsory=true
 type=python_boolean
 sort-key=nimrod-radar-7
 
+[template variables=PROCESS_RADAR_2D]
+ns=Observations/Radar
+title=Produce Nimrod 2D surface plots
+description=Produce 2D surface plots of radar observations.
+help=Switch to produce 2D surface plots utilising Nimrod radar observations.
+     Plots are produced of the 2D surface rainfall for each of the selected Nimrod sources.
+     Plots of the associated Nimrod weights fields are also produced.
+compulsory=true
+type=python_boolean
+sort-key=nimrod-radar-8
+
+[template variables=PROCESS_RADAR_HISTOGRAMS]
+ns=Observations/Radar
+title=Produce Nimrod radar histograms
+description=Produce histograms incorporating radar observations.
+help=Switch to produce histograms utilising Nimrod radar observations.
+     The histograms will combine both model rainfall and radar observations.
+     The model rainfall variable is selected in in the Rose tab Diagnostics/Surface (2D) fields.
+compulsory=true
+type=python_boolean
+sort-key=nimrod-radar-9
+
+
+
+
 ################################################################
 # Cardington UK Research Observations
 [ns=Observations/Cardington]