diff --git a/ProcessorDeposition.py b/ProcessorDeposition.py index b57ed201f71ed78dca5c4000ac6453a45d669132..2e2df48d88a3258f576f2e3f58e42a78619e7697 100644 --- a/ProcessorDeposition.py +++ b/ProcessorDeposition.py @@ -7,6 +7,9 @@ from pathlib import Path import os from string import Template +import iris +from iris.cube import CubeList + from plotting.common.plotting_coordinator.ews_depo_disease_plotting_coordinator import EWSPlottingDepoBase from ProcessorUtils import ( @@ -48,10 +51,22 @@ def process_in_job_dep(jobPath,status,config,component): # basic check that contents are as expected # 132 files of NAME .txt timesteps and one summary png file - if len(glob(f"{jobPath}/{file_name}/deposition_srcs_allregions_C1_T*.txt")) != 56: - msg = f"Unexpect number of deposition .txt files in input tar file. Expected 56." - logger.error(msg) - raise RuntimeError(msg) + # if len(glob(f"{jobPath}/{file_name}/deposition_srcs_allregions_C1_T*.txt")) != 56: + # msg = f"Unexpect number of deposition .txt files in input tar file. Expected 56." + # logger.error(msg) + # raise RuntimeError(msg) + + # basic check that contents are as expected (56 timepoints in the file) + cube_wildcard = f"{jobPath}/{file_name}/deposition_srcs_allregions*.nc" + cubes: CubeList = iris.load(cube_wildcard) + for cube in cubes: + coord = cube.coord("time") + timepoint_count = coord.shape[0] + if timepoint_count != 56: + msg = f"Unexpected number of timepoints ({timepoint_count}) in cube {cube.name()}" + logger.error(msg) + raise RuntimeError(msg) + return