Skip to content
Snippets Groups Projects
Commit 01bd8aac authored by Anne Tipka's avatar Anne Tipka :headphones:
Browse files

added history comments to previous commit changes and minor additional corrections

parent 373b74eb
Branches
No related tags found
No related merge requests found
...@@ -26,6 +26,10 @@ ...@@ -26,6 +26,10 @@
# - added function to check if a specific string is in a file # - added function to check if a specific string is in a file
# - added function to overwrite lines in a file which contain specific string # - added function to overwrite lines in a file which contain specific string
# #
# July 2022 - Anne Tipka (formerly Philipp)
# - modified function put_file_to_ecserver to put the file automatically
# to $HOME directory, to avoid static path creation
#
# @License: # @License:
# (C) Copyright 2014-2020. # (C) Copyright 2014-2020.
# Anne Philipp, Leopold Haimberger # Anne Philipp, Leopold Haimberger
......
...@@ -13,6 +13,9 @@ ...@@ -13,6 +13,9 @@
# - added filename which will contain paths for system version # - added filename which will contain paths for system version
# - checks if software runs in normal local mode or system local mode # - checks if software runs in normal local mode or system local mode
# and defines paths to user directory and executable paths # and defines paths to user directory and executable paths
# July 2022 - Anne Tipka (formerly Philipp)
# - modified to account for changes on Bologna servers,
# e.g. queue names and hostnames
# #
# @License: # @License:
# (C) Copyright 2014-2020. # (C) Copyright 2014-2020.
......
...@@ -26,6 +26,11 @@ ...@@ -26,6 +26,11 @@
# - read new argument from command line # - read new argument from command line
# - write .setup.rc for a system installation into Run directory # - write .setup.rc for a system installation into Run directory
# - copy executables to system path and user files to user path # - copy executables to system path and user files to user path
# July 2022 - Anne Tipka (formerly Philipp)
# - BugFix: sysinstalldir must be defined in related else path
# - template files are now using $HOME and $SCRATCH and hence don't
# need ecmwf user group id. Eliminated from function mk_compile_job
# and mk_job_template
# #
# @License: # @License:
# (C) Copyright 2014-2020. # (C) Copyright 2014-2020.
...@@ -680,7 +685,7 @@ def mk_compilejob(makefile, ecuid, fp_root): ...@@ -680,7 +685,7 @@ def mk_compilejob(makefile, ecuid, fp_root):
return return
def mk_job_template(ecuid, ecgid, fp_root): def mk_job_template(ecuid, fp_root):
'''Modifies the original job template file so that it is specified '''Modifies the original job template file so that it is specified
for the user and the environment were it will be applied. Result for the user and the environment were it will be applied. Result
is stored in a new file. is stored in a new file.
...@@ -690,9 +695,6 @@ def mk_job_template(ecuid, ecgid, fp_root): ...@@ -690,9 +695,6 @@ def mk_job_template(ecuid, ecgid, fp_root):
ecuid : str ecuid : str
The user id on ECMWF server. The user id on ECMWF server.
ecgid : str
The group id on ECMWF server.
fp_root : str fp_root : str
Path to the root directory of FLEXPART environment or flex_extract Path to the root directory of FLEXPART environment or flex_extract
environment. environment.
...@@ -719,7 +721,6 @@ def mk_job_template(ecuid, ecgid, fp_root): ...@@ -719,7 +721,6 @@ def mk_job_template(ecuid, ecgid, fp_root):
cls=NewTextTemplate) cls=NewTextTemplate)
stream = compile_template.generate( stream = compile_template.generate(
usergroup=ecgid,
username=ecuid, username=ecuid,
version_number=_config._VERSION_STR, version_number=_config._VERSION_STR,
fp_root_path=fp_root_path_to_python, fp_root_path=fp_root_path_to_python,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment