Changeset c5074d2 in flex_extract.git for source/python/install.py

Timestamp:

Oct 9, 2018, 8:42:16 PM (6 years ago)

Author:

Anne Philipp <anne.philipp@…>

Branches:

master, ctbto, dev

Children:

aa275fc

Parents:

0a06607

Message:

added making of namelist file and jobscript via genshi templates

File:

• source/python/install.py (modified) (3 diffs)

source/python/install.py

@@ -396 +396 @@
 
     stream = compile_template.generate(
+        usergroup = ecgid,
         username = ecuid,
-        usergroup = ecgid,
         version_number = _config._VERSION_STR,
         fp_root_scripts = fp_root,
@@ -410 +410 @@
         f.write(stream.render('text'))
 
-
-    # template = os.path.join(_config.PATH_REL_TEMPLATES,
-                            # _config.TEMPFILE_INSTALL_COMPILEJOB)
-    # with open(template) as f:
-        # fdata = f.read().split('\n')
-
-
-    # with open(compilejob, 'w') as fo:
-        # for data in fdata:
-            # if 'MAKEFILE=' in data:
-                # data = 'export MAKEFILE=' + makefile
-            # elif 'FLEXPART_ROOT_SCRIPTS=' in data:
-                # if fp_root != '../':
-                    # data = 'export FLEXPART_ROOT_SCRIPTS=' + fp_root
-                # else:
-                    # data = 'export FLEXPART_ROOT_SCRIPTS=$HOME'
-            # elif target.lower() != 'local':
-                # if '--workdir' in data:
-                    # data = '#SBATCH --workdir=/scratch/ms/' + \
-                            # ecgid + '/' + ecuid
-                # elif '##PBS -o' in data:
-                    # data = '##PBS -o /scratch/ms/' + ecgid + '/' + ecuid + \
-                           # 'flex_ecmwf.$Jobname.$Job_ID.out'
-                # elif 'FLEXPART_ROOT_SCRIPTS=' in data:
-                    # if fp_root != '../':
-                        # data = 'export FLEXPART_ROOT_SCRIPTS=' + fp_root
-                    # else:
-                        # data = 'export FLEXPART_ROOT_SCRIPTS=$HOME'
-            # fo.write(data + '\n')
-
     return
 
@@ -470 +440 @@
         <nothing>
     '''
-    fp_root_path_to_python = os.path.join(fp_root, _config.FLEXEXTRACT_DIRNAME,
-                         _config.PATH_REL_PYTHON)
-
-    template = os.path.join(_config.PATH_REL_TEMPLATES,
-                            _config.TEMPFILE_INSTALL_JOB)
-    with open(template) as f:
-        fdata = f.read().split('\n')
-
-    jobfile_temp = os.path.join(_config.PATH_REL_TEMPLATES,
-                                _config.TEMPFILE_JOB)
-    with open(jobfile_temp, 'w') as fo:
-        for data in fdata:
-            if '--workdir' in data:
-                data = '#SBATCH --workdir=/scratch/ms/' + ecgid + '/' + ecuid
-            elif '##PBS -o' in data:
-                data = '##PBS -o /scratch/ms/' + ecgid + '/' + \
-                        ecuid + 'flex_ecmwf.$Jobname.$Job_ID.out'
-            elif  'export PATH=${PATH}:' in data:
-                data += fp_root_path_to_python
-
-            fo.write(data + '\n')
+    from genshi.template.text import NewTextTemplate
+    from genshi.template import  TemplateLoader
+
+    loader = TemplateLoader(_config.PATH_TEMPLATES, auto_reload=False)
+    compile_template = loader.load(_config.TEMPFILE_INSTALL_JOB,
+                                   cls=NewTextTemplate)
+
+    fp_root_path_to_python = os.path.join(fp_root,
+                                          _config.FLEXEXTRACT_DIRNAME,
+                                          _config.PATH_REL_PYTHON)
+
+    stream = compile_template.generate(
+        usergroup = ecgid,
+        username = ecuid,
+        version_number = _config._VERSION_STR,
+        fp_root_path = fp_root_path_to_python,
+    )
+
+    tempjobfile = os.path.join(_config.PATH_TEMPLATES,
+                               _config.TEMPFILE_JOB)
+
+    with open(tempjobfile, 'w') as f:
+        f.write(stream.render('text'))
+
     return