Minor fixes for other jobs

C2SM · Sep 30, 2023 · 7660c48 · 7660c48
1 parent 3d928a3
commit 7660c48
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/cases/cosmo-ghg-spinup-test/int2lm_INPUT.cfg b/cases/cosmo-ghg-spinup-test/int2lm_INPUT.cfg
@@ -1,6 +1,6 @@
 &CONTRL
     yinput_model = 'COSMO', ! string to identify the input model
-    ydate_ini = '{inidate_int2lm_yyyymmddhh}',   ! start of the forecast
+    ydate_ini = '{cfg.inidate_int2lm_yyyymmddhh}',   ! start of the forecast
 
     hstart = {hstart_int2lm},      ! first hour to be processed
     hstop = {hstop_int2lm},        ! last hour to be processed
@@ -140,7 +140,7 @@
   ylmext_lfn='{extpar_filename}',
   ylmext_cat='../input/extpar/',
   ylmext_form_read='ncdf', ! Input format of external data
-  yinext_lfn='{meteo_prefix}{inidate_int2lm_yyyymmddhh}', ! Name of the file with the external fields
+  yinext_lfn='{meteo_prefix}{cfg.inidate_int2lm_yyyymmddhh}', ! Name of the file with the external fields
   yinext_cat='../input/meteo/',
   yinext_form_read="grb1", ! Input format of external data from coarse grid
   ie_ext=600,

diff --git a/jobs/int2lm.py b/jobs/int2lm.py
@@ -68,7 +68,7 @@ def main(starttime, hstart, hstop, cfg, model_cfg):
     cfg : config-object
         Object holding all user-configuration parameters as attributes
     """
-    cfg = set_int2lm_variables(cfg)
+    cfg = set_cfg_variables(cfg)
     hstart_int2lm = 0
     hstop_int2lm = cfg.forecasttime
 
@@ -149,7 +149,6 @@ def main(starttime, hstart, hstop, cfg, model_cfg):
             int2lm_namelist.format(
                 cfg=cfg,
                 **cfg.int2lm,
-                inidate_int2lm_yyyymmddhh=inidate_int2lm_yyyymmddhh,
                 hstart_int2lm=hstart_int2lm,
                 hstop_int2lm=hstop_int2lm,
                 multi_layer=multi_layer,
@@ -171,8 +170,8 @@ def main(starttime, hstart, hstop, cfg, model_cfg):
             int2lm_runscript.format(cfg=cfg,
                                     **cfg.int2lm,
                                     int2lm_run=int2lm_run,
-                                    ini_day=inidate_int2lm_yyyymmddhh[0:8],
-                                    ini_hour=inidate_int2lm_yyyymmddhh[8:],
+                                    ini_day=cfg.inidate_int2lm_yyyymmddhh[0:8],
+                                    ini_hour=cfg.inidate_int2lm_yyyymmddhh[8:],
                                     np_tot=np_tot,
                                     hstop_int2lm=hstop_int2lm,
                                     logfile=logfile,

diff --git a/jobs/oem.py b/jobs/oem.py
@@ -5,7 +5,7 @@
 import os
 import logging
 
-from . import tools
+from . import tools, cosmo
 
 
 def main(starttime, hstart, hstop, cfg, model_cfg):
@@ -23,6 +23,7 @@ def main(starttime, hstart, hstop, cfg, model_cfg):
     cfg : config-object
         Object holding all user-configuration parameters as attributes
     """
+    cfg = cosmo.set_cfg_variables(cfg, model_cfg)
 
     oem_dir = cfg.oem['dir']
     oem_gridded_emissions_nc = os.path.join(oem_dir,