diff --git a/env/DAMASK.csh b/env/DAMASK.csh index 5529eac23..cc61449d2 100644 --- a/env/DAMASK.csh +++ b/env/DAMASK.csh @@ -51,4 +51,4 @@ else setenv PYTHONPATH $DAMASK_ROOT/python:$PYTHONPATH endif setenv MSC_ROOT -setenv MARC_VERSION +setenv MSC_VERSION diff --git a/installation/mods_MarcMentat/apply_DAMASK_modifications.py b/installation/mods_MarcMentat/apply_DAMASK_modifications.py index 51f5e2312..407c33558 100755 --- a/installation/mods_MarcMentat/apply_DAMASK_modifications.py +++ b/installation/mods_MarcMentat/apply_DAMASK_modifications.py @@ -7,15 +7,15 @@ from pathlib import Path import damask -marc_version = float(damask.environment.options['MSC_VERSION']) -if int(marc_version) == marc_version: - marc_version = int(marc_version) +msc_version = float(damask.environment.options['MSC_VERSION']) +if int(msc_version) == msc_version: + msc_version = int(msc_version) msc_root = Path(damask.environment.options['MSC_ROOT']) damask_root = damask.environment.root_dir parser = argparse.ArgumentParser( description='Apply DAMASK modification to MSC.Marc/Mentat', - epilog = f'MSC_ROOT={msc_root} and MSC_VERSION={marc_version} (from {damask_root}/env/CONFIG)') + epilog = f'MSC_ROOT={msc_root} and MSC_VERSION={msc_version} (from {damask_root}/env/CONFIG)') parser.add_argument('--editor', dest='editor', metavar='string', default='vi', help='Name of the editor for MSC.Mentat (executable)') @@ -24,7 +24,7 @@ def copy_and_replace(in_file,dst): with open(in_file) as f: content = f.read() content = content.replace('%INSTALLDIR%',str(msc_root)) - content = content.replace('%VERSION%',str(marc_version)) + content = content.replace('%VERSION%',str(msc_version)) content = content.replace('%EDITOR%', parser.parse_args().editor) with open(dst/Path(in_file).name,'w') as f: f.write(content) @@ -32,36 +32,36 @@ def copy_and_replace(in_file,dst): print('adapting Marc tools...\n') -src = damask_root/f'installation/mods_MarcMentat/{marc_version}/Marc_tools' -dst = msc_root/f'marc{marc_version}/tools' +src = damask_root/f'installation/mods_MarcMentat/{msc_version}/Marc_tools' +dst = msc_root/f'marc{msc_version}/tools' for in_file in glob.glob(str(src/'*damask*')) + [str(src/'include_linux64')]: copy_and_replace(in_file,dst) print('adapting Mentat scripts and menus...\n') -src = damask_root/f'installation/mods_MarcMentat/{marc_version}/Mentat_bin' -dst = msc_root/f'mentat{marc_version}/bin' +src = damask_root/f'installation/mods_MarcMentat/{msc_version}/Mentat_bin' +dst = msc_root/f'mentat{msc_version}/bin' for in_file in glob.glob(str(src/'*[!.original]')): copy_and_replace(in_file,dst) -src = damask_root/f'installation/mods_MarcMentat/{marc_version}/Mentat_menus' -dst = msc_root/f'mentat{marc_version}/menus' +src = damask_root/f'installation/mods_MarcMentat/{msc_version}/Mentat_menus' +dst = msc_root/f'mentat{msc_version}/menus' for in_file in glob.glob(str(src/'job_run.ms')): copy_and_replace(in_file,dst) print('compiling Mentat menu binaries...') -executable = str(msc_root/f'mentat{marc_version}/bin/mentat') -menu_file = str(msc_root/f'mentat{marc_version}/menus/linux64/main.msb') +executable = str(msc_root/f'mentat{msc_version}/bin/mentat') +menu_file = str(msc_root/f'mentat{msc_version}/menus/linux64/main.msb') os.system(f'xvfb-run {executable} -compile {menu_file}') print('setting file access rights...\n') -for pattern in [msc_root/f'marc{marc_version}/tools/*damask*', - msc_root/f'mentat{marc_version}/bin/submit?', - msc_root/f'mentat{marc_version}/bin/kill?']: +for pattern in [msc_root/f'marc{msc_version}/tools/*damask*', + msc_root/f'mentat{msc_version}/bin/submit?', + msc_root/f'mentat{msc_version}/bin/kill?']: for f in glob.glob(str(pattern)): os.chmod(f,0o755)