From ae3e95923350f8b9be4c368720bea71ccdc37b10 Mon Sep 17 00:00:00 2001
From: James Frost <james.frost@metoffice.gov.uk>
Date: Tue, 20 Aug 2024 14:00:33 +0100
Subject: [PATCH] Convert recipe and include file

---
 ...istic_domain_surface_histogram_series.cylc | 20 +++++++++----------
 .../generic_surface_histogram_series.yaml     | 11 ----------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/cset-workflow/includes/deterministic_domain_surface_histogram_series.cylc b/cset-workflow/includes/deterministic_domain_surface_histogram_series.cylc
index 29908126a..e031b892d 100644
--- a/cset-workflow/includes/deterministic_domain_surface_histogram_series.cylc
+++ b/cset-workflow/includes/deterministic_domain_surface_histogram_series.cylc
@@ -1,16 +1,16 @@
 {% if DOMAIN_SURFACE_HISTOGRAM_SERIES_FIELD %}
+{% for equivalent_field in restructure_field_list(SURFACE_MODEL_FIELDS) %}
+{% for model_number, field in equivalent_field.items() %}
 [runtime]
-{% for model_field in SURFACE_MODEL_FIELDS %}
-    [[pre_process_deterministic_domain_surface_histogram_series_{{model_field}}]]
-    inherit = PARALLEL
+    [[generic_surface_histogram_series_m{{model_number}}_{{sanitise_task_name(field)}}]]
+    inherit = PROCESS
         [[[environment]]]
         CSET_RECIPE_NAME = "generic_surface_histogram_series.yaml"
-        CSET_ADDOPTS = "--VARNAME='{{model_field}}'"
-
-    [[collate_deterministic_domain_surface_histogram_series_{{model_field}}]]
-    inherit = COLLATE
-        [[[environment]]]
-        CSET_RECIPE_NAME = "generic_surface_histogram_series.yaml"
-        CSET_ADDOPTS = "--VARNAME='{{model_field}}'"
+        CSET_ADDOPTS = """
+            --VARNAME='{{field}}'
+            --MODEL_NAME='{{models[model_number-1]["name"]}}'
+        """
+        MODEL_NUMBER = {{model_number}}
+{% endfor %}
 {% endfor %}
 {% endif %}
diff --git a/src/CSET/recipes/generic_surface_histogram_series.yaml b/src/CSET/recipes/generic_surface_histogram_series.yaml
index 656f82ba5..fc017d81c 100644
--- a/src/CSET/recipes/generic_surface_histogram_series.yaml
+++ b/src/CSET/recipes/generic_surface_histogram_series.yaml
@@ -14,22 +14,11 @@ parallel:
       variable_constraint:
         operator: constraints.generate_var_constraint
         varname: $VARNAME
-      validity_time_constraint:
-        operator: constraints.generate_time_constraint
-        time_start: $VALIDITY_TIME
       pressure_level_constraint:
         operator: constraints.generate_level_constraint
         coordinate: pressure
         levels: []
 
-  - operator: write.write_cube_to_nc
-    filename: intermediate/histogram
-
-
-collate:
-  - operator: read.read_cube
-    filename_pattern: intermediate/*.nc
-
   - operator: write.write_cube_to_nc
     overwrite: True