From 5eea876abd5b4b15b7e7bd6af0f88992c1feafc3 Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Thu, 18 Aug 2022 16:50:47 +0100
Subject: [PATCH] more work to unify era5_met_extractor and ews_met_extractor
---
EnvSuitPipeline.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/EnvSuitPipeline.py b/EnvSuitPipeline.py
index f503103..20a9019 100644
--- a/EnvSuitPipeline.py
+++ b/EnvSuitPipeline.py
@@ -109,9 +109,9 @@ def run_post_processing(run_params: dict, sys_params: dict, processor_name: str)
logger.info('Data extracted and chunked')
-def run_merger(run_params: dict, sys_params: dict):
+def run_merger(run_params: dict, sys_params: dict, processor_name: str):
try:
- job_runner.run_merge_post_processing(run_params, sys_params)
+ job_runner.run_merge_post_processing(run_params, sys_params, processor_name)
except Exception:
logger.exception(f"Some failure when running merge RIE", exc_info=True)
raise
@@ -218,7 +218,7 @@ def run_pipeline(pipeline_config, region, dateString, extracted = False, prevent
logger.info(f"Starting {processor_name} post processor ---------------------------------")
run_post_processing(config, sys_config, processor_name)
- run_merger(config, sys_config)
+ run_merger(config, sys_config, processor_name)
else:
strains = getParameter(pipeline_config, 'STRAINS')
@@ -251,7 +251,7 @@ def run_pipeline(pipeline_config, region, dateString, extracted = False, prevent
envSuitPath = workPath + 'post_processing/RIE/'
run_post_processing(config, sys_config, processor_name)
- run_merger(config, sys_config)
+ run_merger(config, sys_config, processor_name)
resultFile = envSuitPath + 'RIE.csv'
strain_outPath = os.path.join(region_outPath,strain)
--
GitLab