Nimrod file format

.travis.yml

@@ -28,7 +28,7 @@ git:
 
 install:
   - >
-    export IRIS_TEST_DATA_REF="1696ac3a823a06b95f430670f285ee97671d2cf2";
+    export IRIS_TEST_DATA_REF="06e3c7d289d4ae177539e71134a2a6f6a1bc8117";
     export IRIS_TEST_DATA_SUFFIX=$(echo "${IRIS_TEST_DATA_REF}" | sed "s/^v//");
 
   # Install miniconda

docs/iris/src/whatsnew/contributions_3.0.0/newfeature_2020-Jan-31_nimrod_format_enhancement.txt

@@ -0,0 +1,3 @@
+* The :class:`~iris.fileformats.nimrod` provides richer meta-data translation
+when loading Nimrod-format data into cubes. This covers most known operational
+use-cases.

lib/iris/fileformats/nimrod.py

@@ -48,7 +48,7 @@
     "proj_biaxial_ellipsoid",
     "ensemble_member",
     "spare1",
-    "spare2",
+    "averagingtype",
 )
 
 
@@ -70,6 +70,8 @@
     "true_origin_easting",
     "true_origin_northing",
     "tm_meridian_scaling",
+    "threshold_value_alt",
+    "threshold_value",
 )
 
 
@@ -87,46 +89,95 @@
     "sat_space_count",
     "ducting_index",
     "elevation_angle",
+    'neighbourhood_radius',
+    'threshold_vicinity_radius',
+    'recursive_filter_alpha',
+    'threshold_fuzziness',
+    'threshold_duration_fuzziness',
+    'data_header_float32_05',
+    'data_header_float32_06',
+    'data_header_float32_07',
+    'data_header_float32_08',
+    'data_header_float32_09',
+    'data_header_float32_10',
+    'data_header_float32_11',
+    'data_header_float32_12',
+    'data_header_float32_13',
+    'data_header_float32_14',
+    'data_header_float32_15',
+    'data_header_float32_16',
+    'data_header_float32_17',
+    'data_header_float32_18',
+    'data_header_float32_19',
+    'data_header_float32_20',
+    'data_header_float32_21',
+    'data_header_float32_22',
+    'data_header_float32_23',
+    'data_header_float32_24',
+    'data_header_float32_25',
+    'data_header_float32_26',
+    'data_header_float32_27',
+    'data_header_float32_28',
+    'data_header_float32_29',
+    'data_header_float32_30',
+    'data_header_float32_31',
+    'data_header_float32_32',
 )
 
 
 # data specific header (int16) elements
 data_header_int16s = (
-    "radar_num",
-    "radars_bitmask",
-    "more_radars_bitmask",
-    "clutter_map_num",
-    "calibration_type",
-    "bright_band_height",
-    "bright_band_intensity",
-    "bright_band_test1",
-    "bright_band_test2",
-    "infill_flag",
-    "stop_elevation",
-    "int16_vertical_coord",
-    "int16_reference_vertical_coord",
-    "int16_y_origin",
-    "int16_row_step",
-    "int16_x_origin",
-    "int16_column_step",
-    "int16_float32_mdi",
-    "int16_data_scaling",
-    "int16_data_offset",
-    "int16_x_offset",
-    "int16_y_offset",
-    "int16_true_origin_latitude",
-    "int16_true_origin_longitude",
-    "int16_tl_y",
-    "int16_tl_x",
-    "int16_tr_y",
-    "int16_ty_x",
-    "int16_br_y",
-    "int16_br_x",
-    "int16_bl_y",
-    "int16_bl_x",
-    "sensor_id",
-    "meteosat_id",
-    "alphas_available",
+    "threshold_type",
+    "probability_method",
+    "recursive_filter_iterations",
+    "member_count",
+    "probability_period_of_event",
+    "data_header_int16_05",
+    "soil_type",
+    "radiation_code",
+    "data_header_int16_08",
+    "data_header_int16_09",
+    "data_header_int16_10",
+    "data_header_int16_11",
+    "data_header_int16_12",
+    "data_header_int16_13",
+    "data_header_int16_14",
+    "data_header_int16_15",
+    "data_header_int16_16",
+    "data_header_int16_17",
+    "data_header_int16_18",
+    "data_header_int16_19",
+    "data_header_int16_20",
+    "data_header_int16_21",
+    "data_header_int16_22",
+    "data_header_int16_23",
+    "data_header_int16_24",
+    "data_header_int16_25",
+    "data_header_int16_26",
+    "data_header_int16_27",
+    "data_header_int16_28",
+    "data_header_int16_29",
+    "data_header_int16_30",
+    "data_header_int16_31",
+    "data_header_int16_32",
+    "data_header_int16_33",
+    "data_header_int16_34",
+    "data_header_int16_35",
+    "data_header_int16_36",
+    "data_header_int16_37",
+    "data_header_int16_38",
+    "data_header_int16_39",
+    "data_header_int16_40",
+    "data_header_int16_41",
+    "data_header_int16_42",
+    "data_header_int16_43",
+    "data_header_int16_44",
+    "data_header_int16_45",
+    "data_header_int16_46",
+    "data_header_int16_47",
+    "data_header_int16_48",
+    "data_header_int16_49",
+    "period_seconds",
 )