Add icontools job

jobs/__init__.py

@@ -7,6 +7,7 @@
 from . import emissions
 from . import geosp
 from . import icon
+from . import icontools
 from . import int2lm
 from . import obs_nudging
 from . import octe

jobs/icontools.py

@@ -0,0 +1,71 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+import os
+from pathlib import Path
+import logging
+import shutil
+import subprocess
+from datetime import timedelta
+import xarray as xr
+from . import tools
+from .tools.interpolate_data import create_oh_for_restart, create_oh_for_inicond
+from .tools.fetch_external_data import fetch_era5, fetch_era5_nudging
+from calendar import monthrange
+
+
+def main(cfg):
+    launch_time = cfg.init_time_logging("icontools")
+
+    #-----------------------------------------------------
+    # Create LBC datafile lists (each at 00 UTC and others)
+    #-----------------------------------------------------
+    datafile_list = []
+    datafile_list_rest = []
+    datafile_list_chem = []
+    for time in tools.iter_hours(cfg.startdate_sim, cfg.enddate_sim,
+                                    cfg.meteo['inc']):
+        meteo_file = cfg.icon_input_icbc / (
+            cfg.meteo['prefix'] + time.strftime(cfg.meteo['nameformat']))
+        if cfg.workflow_name == 'icon-art' or cfg.workflow_name == 'icon-art-oem':
+            chem_file = cfg.icon_input_icbc / (
+                cfg.chem['prefix'] + time.strftime(cfg.chem_nameformat))
+            datafile_list_chem.append(str(chem_file) + cfg.chem['suffix'])
+        if str(meteo_file).endswith('00'):
+            datafile_list.append(str(meteo_file) + cfg.meteo['suffix'])
+        else:
+            datafile_list_rest.append(
+                str(meteo_file) + cfg.meteo['suffix'])
+    datafile_list = ' '.join([str(v) for v in datafile_list])
+    datafile_list_rest = ' '.join([str(v) for v in datafile_list_rest])
+    datafile_list_chem = ' '.join([str(v) for v in datafile_list_chem])
+
+    #-----------------------------------------------------
+    # Write and submit runscripts
+    #-----------------------------------------------------
+    icontools_id = None
+    for runscript in cfg.icontools_runjobs:
+        with (cfg.case_path / runscript).open() as input_file:
+            to_write = input_file.read()
+        runscript_path = cfg.icon_work / f"{runscript}.job"
+        with runscript_path.open("w") as outf:
+            outf.write(
+                to_write.format(cfg=cfg,
+                                meteo=cfg.meteo,
+                                logfile=logfile,
+                                logfile_finish=logfile_finish,
+                                datafile_list=datafile_list,
+                                datafile_list_rest=datafile_list_rest,
+                                datafile_list_chem=datafile_list_chem))
+
+        # Submitting icontools runscripts sequentially
+        logging.info(f" Starting icontools runscript {runscript}.")
+        if icontools_id:
+            dependencies = (copy_id, icontools_id)
+        else:
+            dependencies = copy_id
+        icontools_id = cfg.submit(runscript,
+                                    runscript_path,
+                                    add_dep=dependencies)
+
+    cfg.finish_time_logging("icontools", launch_time)

jobs/prepare_data.py

@@ -65,9 +65,6 @@ def async_error(cfg, part="This part"):
             f"{part} isn't ready for async execution yet")
 
 
-# ... (previous code remains unchanged)
-
-
 def main(cfg):
     """
     **ICON and COSMO Data Preparation**
@@ -139,57 +136,6 @@ def main(cfg):
 
         copy_id = cfg.submit('prepare_data', script)
 
-        #-----------------------------------------------------
-        # Create LBC datafile lists (each at 00 UTC and others)
-        #-----------------------------------------------------
-        datafile_list = []
-        datafile_list_rest = []
-        datafile_list_chem = []
-        for time in tools.iter_hours(cfg.startdate_sim, cfg.enddate_sim,
-                                     cfg.meteo['inc']):
-            meteo_file = cfg.icon_input_icbc / (
-                cfg.meteo['prefix'] + time.strftime(cfg.meteo['nameformat']))
-            if cfg.workflow_name == 'icon-art' or cfg.workflow_name == 'icon-art-oem':
-                chem_file = cfg.icon_input_icbc / (
-                    cfg.chem['prefix'] + time.strftime(cfg.chem_nameformat))
-                datafile_list_chem.append(str(chem_file) + cfg.chem['suffix'])
-            if str(meteo_file).endswith('00'):
-                datafile_list.append(str(meteo_file) + cfg.meteo['suffix'])
-            else:
-                datafile_list_rest.append(
-                    str(meteo_file) + cfg.meteo['suffix'])
-        datafile_list = ' '.join([str(v) for v in datafile_list])
-        datafile_list_rest = ' '.join([str(v) for v in datafile_list_rest])
-        datafile_list_chem = ' '.join([str(v) for v in datafile_list_chem])
-
-        #-----------------------------------------------------
-        # Write and submit runscripts
-        #-----------------------------------------------------
-        icontools_id = None
-        for runscript in cfg.icontools_runjobs:
-            with (cfg.case_path / runscript).open() as input_file:
-                to_write = input_file.read()
-            runscript_path = cfg.icon_work / f"{runscript}.job"
-            with runscript_path.open("w") as outf:
-                outf.write(
-                    to_write.format(cfg=cfg,
-                                    meteo=cfg.meteo,
-                                    logfile=logfile,
-                                    logfile_finish=logfile_finish,
-                                    datafile_list=datafile_list,
-                                    datafile_list_rest=datafile_list_rest,
-                                    datafile_list_chem=datafile_list_chem))
-
-            # Submitting icontools runscripts sequentially
-            logging.info(f" Starting icontools runscript {runscript}.")
-            if icontools_id:
-                dependencies = (copy_id, icontools_id)
-            else:
-                dependencies = copy_id
-            icontools_id = cfg.submit(runscript,
-                                      runscript_path,
-                                      add_dep=dependencies)
-
     # If COSMO (and not ICON):
     else:
         async_error(cfg, part='COSMO')