From 72be56860e0c0f2cee60566dc01e8fa49b6756c2 Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Fri, 9 Jul 2021 17:51:35 +0200 Subject: [PATCH 1/3] adapted to new directory name --- installation/MarcMentat/apply_DAMASK_modifications.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/installation/MarcMentat/apply_DAMASK_modifications.py b/installation/MarcMentat/apply_DAMASK_modifications.py index 38323b3f7..85792a413 100755 --- a/installation/MarcMentat/apply_DAMASK_modifications.py +++ b/installation/MarcMentat/apply_DAMASK_modifications.py @@ -37,7 +37,7 @@ msc_version = args.msc_version print('adapting Marc tools...\n') -src = damask_root/f'installation/mods_MarcMentat/{msc_version}/Marc_tools' +src = damask_root/f'installation/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,args.msc_root,args.editor) @@ -45,12 +45,12 @@ for in_file in glob.glob(str(src/'*damask*')) + [str(src/'include_linux64')]: print('adapting Mentat scripts and menus...\n') -src = damask_root/f'installation/mods_MarcMentat/{msc_version}/Mentat_bin' +src = damask_root/f'installation/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,args.msc_root,args.editor) -src = damask_root/f'installation/mods_MarcMentat/{msc_version}/Mentat_menus' +src = damask_root/f'installation/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,args.msc_root,args.editor) From 79420463f222dfdeb8a65ebd46aa011d0963ba28 Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Fri, 9 Jul 2021 22:25:56 +0200 Subject: [PATCH 2/3] make xvfb automatically find a free server --- installation/MarcMentat/apply_DAMASK_modifications.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installation/MarcMentat/apply_DAMASK_modifications.py b/installation/MarcMentat/apply_DAMASK_modifications.py index 85792a413..6d1630c00 100755 --- a/installation/MarcMentat/apply_DAMASK_modifications.py +++ b/installation/MarcMentat/apply_DAMASK_modifications.py @@ -60,7 +60,7 @@ print('compiling Mentat menu binaries...') executable = msc_root/f'mentat{msc_version}/bin/mentat' menu_file = msc_root/f'mentat{msc_version}/menus/linux64/main.msb' -os.system(f'xvfb-run {executable} -compile {menu_file}') +os.system(f'xvfb-run -a {executable} -compile {menu_file}') print('setting file access rights...\n') From 58e0e5f4f7bc3310ddefefd7113ff3caf8083dfe Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 10 Jul 2021 11:41:33 +0200 Subject: [PATCH 3/3] matches other short names (src, img, ..) --- .gitattributes | 4 ++-- .../MarcMentat/2020/Marc_tools/comp_damask_hmp | 0 .../MarcMentat/2020/Marc_tools/comp_damask_lmp | 0 .../MarcMentat/2020/Marc_tools/comp_damask_mp | 0 .../MarcMentat/2020/Marc_tools/comp_user.original | 0 .../MarcMentat/2020/Marc_tools/include_linux64 | 0 .../MarcMentat/2020/Marc_tools/include_linux64.original | 0 .../MarcMentat/2020/Marc_tools/run_damask_hmp | 0 .../MarcMentat/2020/Marc_tools/run_damask_lmp | 0 .../MarcMentat/2020/Marc_tools/run_damask_mp | 0 .../MarcMentat/2020/Marc_tools/run_marc.original | 0 .../MarcMentat/2020/Mentat_bin/edit_window | 0 .../MarcMentat/2020/Mentat_bin/edit_window.original | 0 .../MarcMentat/2020/Mentat_bin/kill1.original | 0 {installation => install}/MarcMentat/2020/Mentat_bin/kill4 | 0 {installation => install}/MarcMentat/2020/Mentat_bin/kill5 | 0 {installation => install}/MarcMentat/2020/Mentat_bin/kill6 | 0 .../MarcMentat/2020/Mentat_bin/submit1.original | 0 .../MarcMentat/2020/Mentat_bin/submit4 | 0 .../MarcMentat/2020/Mentat_bin/submit5 | 0 .../MarcMentat/2020/Mentat_bin/submit6 | 0 .../MarcMentat/2020/Mentat_menus/job_run.ms | 0 .../MarcMentat/2020/Mentat_menus/job_run.ms.original | 0 .../MarcMentat/2021.2/Marc_tools/comp_damask_hmp | 0 .../MarcMentat/2021.2/Marc_tools/comp_damask_lmp | 0 .../MarcMentat/2021.2/Marc_tools/comp_damask_mp | 0 .../MarcMentat/2021.2/Marc_tools/comp_user.original | 0 .../MarcMentat/2021.2/Marc_tools/include_linux64 | 0 .../MarcMentat/2021.2/Marc_tools/include_linux64.original | 0 .../MarcMentat/2021.2/Marc_tools/run_damask_hmp | 0 .../MarcMentat/2021.2/Marc_tools/run_damask_lmp | 0 .../MarcMentat/2021.2/Marc_tools/run_damask_mp | 0 .../MarcMentat/2021.2/Marc_tools/run_marc.original | 0 .../MarcMentat/2021.2/Mentat_bin/edit_window | 0 .../MarcMentat/2021.2/Mentat_bin/edit_window.original | 0 .../MarcMentat/2021.2/Mentat_bin/kill1.original | 0 .../MarcMentat/2021.2/Mentat_bin/kill4 | 0 .../MarcMentat/2021.2/Mentat_bin/kill5 | 0 .../MarcMentat/2021.2/Mentat_bin/kill6 | 0 .../MarcMentat/2021.2/Mentat_bin/submit1.original | 0 .../MarcMentat/2021.2/Mentat_bin/submit4 | 0 .../MarcMentat/2021.2/Mentat_bin/submit5 | 0 .../MarcMentat/2021.2/Mentat_bin/submit6 | 0 .../MarcMentat/2021.2/Mentat_menus/job_run.ms | 0 .../MarcMentat/2021.2/Mentat_menus/job_run.ms.original | 0 .../MarcMentat/apply_DAMASK_modifications.py | 6 +++--- {installation => install}/MarcMentat/installation.txt | 0 47 files changed, 5 insertions(+), 5 deletions(-) rename {installation => install}/MarcMentat/2020/Marc_tools/comp_damask_hmp (100%) rename {installation => install}/MarcMentat/2020/Marc_tools/comp_damask_lmp (100%) rename {installation => install}/MarcMentat/2020/Marc_tools/comp_damask_mp (100%) rename {installation => install}/MarcMentat/2020/Marc_tools/comp_user.original (100%) rename {installation => install}/MarcMentat/2020/Marc_tools/include_linux64 (100%) rename {installation => install}/MarcMentat/2020/Marc_tools/include_linux64.original (100%) rename {installation => install}/MarcMentat/2020/Marc_tools/run_damask_hmp (100%) rename {installation => install}/MarcMentat/2020/Marc_tools/run_damask_lmp (100%) rename {installation => install}/MarcMentat/2020/Marc_tools/run_damask_mp (100%) rename {installation => install}/MarcMentat/2020/Marc_tools/run_marc.original (100%) rename {installation => install}/MarcMentat/2020/Mentat_bin/edit_window (100%) rename {installation => install}/MarcMentat/2020/Mentat_bin/edit_window.original (100%) rename {installation => install}/MarcMentat/2020/Mentat_bin/kill1.original (100%) rename {installation => install}/MarcMentat/2020/Mentat_bin/kill4 (100%) rename {installation => install}/MarcMentat/2020/Mentat_bin/kill5 (100%) rename {installation => install}/MarcMentat/2020/Mentat_bin/kill6 (100%) rename {installation => install}/MarcMentat/2020/Mentat_bin/submit1.original (100%) rename {installation => install}/MarcMentat/2020/Mentat_bin/submit4 (100%) rename {installation => install}/MarcMentat/2020/Mentat_bin/submit5 (100%) rename {installation => install}/MarcMentat/2020/Mentat_bin/submit6 (100%) rename {installation => install}/MarcMentat/2020/Mentat_menus/job_run.ms (100%) rename {installation => install}/MarcMentat/2020/Mentat_menus/job_run.ms.original (100%) rename {installation => install}/MarcMentat/2021.2/Marc_tools/comp_damask_hmp (100%) rename {installation => install}/MarcMentat/2021.2/Marc_tools/comp_damask_lmp (100%) rename {installation => install}/MarcMentat/2021.2/Marc_tools/comp_damask_mp (100%) rename {installation => install}/MarcMentat/2021.2/Marc_tools/comp_user.original (100%) rename {installation => install}/MarcMentat/2021.2/Marc_tools/include_linux64 (100%) rename {installation => install}/MarcMentat/2021.2/Marc_tools/include_linux64.original (100%) rename {installation => install}/MarcMentat/2021.2/Marc_tools/run_damask_hmp (100%) rename {installation => install}/MarcMentat/2021.2/Marc_tools/run_damask_lmp (100%) rename {installation => install}/MarcMentat/2021.2/Marc_tools/run_damask_mp (100%) rename {installation => install}/MarcMentat/2021.2/Marc_tools/run_marc.original (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_bin/edit_window (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_bin/edit_window.original (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_bin/kill1.original (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_bin/kill4 (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_bin/kill5 (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_bin/kill6 (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_bin/submit1.original (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_bin/submit4 (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_bin/submit5 (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_bin/submit6 (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_menus/job_run.ms (100%) rename {installation => install}/MarcMentat/2021.2/Mentat_menus/job_run.ms.original (100%) rename {installation => install}/MarcMentat/apply_DAMASK_modifications.py (92%) rename {installation => install}/MarcMentat/installation.txt (100%) diff --git a/.gitattributes b/.gitattributes index 0fbe302e9..6bc316a77 100644 --- a/.gitattributes +++ b/.gitattributes @@ -12,9 +12,9 @@ *.pbz2 binary # ignore files from MSC.Marc in language statistics -installation/MarcMentat/** linguist-vendored +install/MarcMentat/** linguist-vendored src/Marc/include/* linguist-vendored -installation/MarcMentat/apply_DAMASK_modifications.py linguist-vendored=false +install/MarcMentat/apply_DAMASK_modifications.py linguist-vendored=false # ignore reference files for tests in language statistics python/tests/reference/** linguist-vendored diff --git a/installation/MarcMentat/2020/Marc_tools/comp_damask_hmp b/install/MarcMentat/2020/Marc_tools/comp_damask_hmp similarity index 100% rename from installation/MarcMentat/2020/Marc_tools/comp_damask_hmp rename to install/MarcMentat/2020/Marc_tools/comp_damask_hmp diff --git a/installation/MarcMentat/2020/Marc_tools/comp_damask_lmp b/install/MarcMentat/2020/Marc_tools/comp_damask_lmp similarity index 100% rename from installation/MarcMentat/2020/Marc_tools/comp_damask_lmp rename to install/MarcMentat/2020/Marc_tools/comp_damask_lmp diff --git a/installation/MarcMentat/2020/Marc_tools/comp_damask_mp b/install/MarcMentat/2020/Marc_tools/comp_damask_mp similarity index 100% rename from installation/MarcMentat/2020/Marc_tools/comp_damask_mp rename to install/MarcMentat/2020/Marc_tools/comp_damask_mp diff --git a/installation/MarcMentat/2020/Marc_tools/comp_user.original b/install/MarcMentat/2020/Marc_tools/comp_user.original similarity index 100% rename from installation/MarcMentat/2020/Marc_tools/comp_user.original rename to install/MarcMentat/2020/Marc_tools/comp_user.original diff --git a/installation/MarcMentat/2020/Marc_tools/include_linux64 b/install/MarcMentat/2020/Marc_tools/include_linux64 similarity index 100% rename from installation/MarcMentat/2020/Marc_tools/include_linux64 rename to install/MarcMentat/2020/Marc_tools/include_linux64 diff --git a/installation/MarcMentat/2020/Marc_tools/include_linux64.original b/install/MarcMentat/2020/Marc_tools/include_linux64.original similarity index 100% rename from installation/MarcMentat/2020/Marc_tools/include_linux64.original rename to install/MarcMentat/2020/Marc_tools/include_linux64.original diff --git a/installation/MarcMentat/2020/Marc_tools/run_damask_hmp b/install/MarcMentat/2020/Marc_tools/run_damask_hmp similarity index 100% rename from installation/MarcMentat/2020/Marc_tools/run_damask_hmp rename to install/MarcMentat/2020/Marc_tools/run_damask_hmp diff --git a/installation/MarcMentat/2020/Marc_tools/run_damask_lmp b/install/MarcMentat/2020/Marc_tools/run_damask_lmp similarity index 100% rename from installation/MarcMentat/2020/Marc_tools/run_damask_lmp rename to install/MarcMentat/2020/Marc_tools/run_damask_lmp diff --git a/installation/MarcMentat/2020/Marc_tools/run_damask_mp b/install/MarcMentat/2020/Marc_tools/run_damask_mp similarity index 100% rename from installation/MarcMentat/2020/Marc_tools/run_damask_mp rename to install/MarcMentat/2020/Marc_tools/run_damask_mp diff --git a/installation/MarcMentat/2020/Marc_tools/run_marc.original b/install/MarcMentat/2020/Marc_tools/run_marc.original similarity index 100% rename from installation/MarcMentat/2020/Marc_tools/run_marc.original rename to install/MarcMentat/2020/Marc_tools/run_marc.original diff --git a/installation/MarcMentat/2020/Mentat_bin/edit_window b/install/MarcMentat/2020/Mentat_bin/edit_window similarity index 100% rename from installation/MarcMentat/2020/Mentat_bin/edit_window rename to install/MarcMentat/2020/Mentat_bin/edit_window diff --git a/installation/MarcMentat/2020/Mentat_bin/edit_window.original b/install/MarcMentat/2020/Mentat_bin/edit_window.original similarity index 100% rename from installation/MarcMentat/2020/Mentat_bin/edit_window.original rename to install/MarcMentat/2020/Mentat_bin/edit_window.original diff --git a/installation/MarcMentat/2020/Mentat_bin/kill1.original b/install/MarcMentat/2020/Mentat_bin/kill1.original similarity index 100% rename from installation/MarcMentat/2020/Mentat_bin/kill1.original rename to install/MarcMentat/2020/Mentat_bin/kill1.original diff --git a/installation/MarcMentat/2020/Mentat_bin/kill4 b/install/MarcMentat/2020/Mentat_bin/kill4 similarity index 100% rename from installation/MarcMentat/2020/Mentat_bin/kill4 rename to install/MarcMentat/2020/Mentat_bin/kill4 diff --git a/installation/MarcMentat/2020/Mentat_bin/kill5 b/install/MarcMentat/2020/Mentat_bin/kill5 similarity index 100% rename from installation/MarcMentat/2020/Mentat_bin/kill5 rename to install/MarcMentat/2020/Mentat_bin/kill5 diff --git a/installation/MarcMentat/2020/Mentat_bin/kill6 b/install/MarcMentat/2020/Mentat_bin/kill6 similarity index 100% rename from installation/MarcMentat/2020/Mentat_bin/kill6 rename to install/MarcMentat/2020/Mentat_bin/kill6 diff --git a/installation/MarcMentat/2020/Mentat_bin/submit1.original b/install/MarcMentat/2020/Mentat_bin/submit1.original similarity index 100% rename from installation/MarcMentat/2020/Mentat_bin/submit1.original rename to install/MarcMentat/2020/Mentat_bin/submit1.original diff --git a/installation/MarcMentat/2020/Mentat_bin/submit4 b/install/MarcMentat/2020/Mentat_bin/submit4 similarity index 100% rename from installation/MarcMentat/2020/Mentat_bin/submit4 rename to install/MarcMentat/2020/Mentat_bin/submit4 diff --git a/installation/MarcMentat/2020/Mentat_bin/submit5 b/install/MarcMentat/2020/Mentat_bin/submit5 similarity index 100% rename from installation/MarcMentat/2020/Mentat_bin/submit5 rename to install/MarcMentat/2020/Mentat_bin/submit5 diff --git a/installation/MarcMentat/2020/Mentat_bin/submit6 b/install/MarcMentat/2020/Mentat_bin/submit6 similarity index 100% rename from installation/MarcMentat/2020/Mentat_bin/submit6 rename to install/MarcMentat/2020/Mentat_bin/submit6 diff --git a/installation/MarcMentat/2020/Mentat_menus/job_run.ms b/install/MarcMentat/2020/Mentat_menus/job_run.ms similarity index 100% rename from installation/MarcMentat/2020/Mentat_menus/job_run.ms rename to install/MarcMentat/2020/Mentat_menus/job_run.ms diff --git a/installation/MarcMentat/2020/Mentat_menus/job_run.ms.original b/install/MarcMentat/2020/Mentat_menus/job_run.ms.original similarity index 100% rename from installation/MarcMentat/2020/Mentat_menus/job_run.ms.original rename to install/MarcMentat/2020/Mentat_menus/job_run.ms.original diff --git a/installation/MarcMentat/2021.2/Marc_tools/comp_damask_hmp b/install/MarcMentat/2021.2/Marc_tools/comp_damask_hmp similarity index 100% rename from installation/MarcMentat/2021.2/Marc_tools/comp_damask_hmp rename to install/MarcMentat/2021.2/Marc_tools/comp_damask_hmp diff --git a/installation/MarcMentat/2021.2/Marc_tools/comp_damask_lmp b/install/MarcMentat/2021.2/Marc_tools/comp_damask_lmp similarity index 100% rename from installation/MarcMentat/2021.2/Marc_tools/comp_damask_lmp rename to install/MarcMentat/2021.2/Marc_tools/comp_damask_lmp diff --git a/installation/MarcMentat/2021.2/Marc_tools/comp_damask_mp b/install/MarcMentat/2021.2/Marc_tools/comp_damask_mp similarity index 100% rename from installation/MarcMentat/2021.2/Marc_tools/comp_damask_mp rename to install/MarcMentat/2021.2/Marc_tools/comp_damask_mp diff --git a/installation/MarcMentat/2021.2/Marc_tools/comp_user.original b/install/MarcMentat/2021.2/Marc_tools/comp_user.original similarity index 100% rename from installation/MarcMentat/2021.2/Marc_tools/comp_user.original rename to install/MarcMentat/2021.2/Marc_tools/comp_user.original diff --git a/installation/MarcMentat/2021.2/Marc_tools/include_linux64 b/install/MarcMentat/2021.2/Marc_tools/include_linux64 similarity index 100% rename from installation/MarcMentat/2021.2/Marc_tools/include_linux64 rename to install/MarcMentat/2021.2/Marc_tools/include_linux64 diff --git a/installation/MarcMentat/2021.2/Marc_tools/include_linux64.original b/install/MarcMentat/2021.2/Marc_tools/include_linux64.original similarity index 100% rename from installation/MarcMentat/2021.2/Marc_tools/include_linux64.original rename to install/MarcMentat/2021.2/Marc_tools/include_linux64.original diff --git a/installation/MarcMentat/2021.2/Marc_tools/run_damask_hmp b/install/MarcMentat/2021.2/Marc_tools/run_damask_hmp similarity index 100% rename from installation/MarcMentat/2021.2/Marc_tools/run_damask_hmp rename to install/MarcMentat/2021.2/Marc_tools/run_damask_hmp diff --git a/installation/MarcMentat/2021.2/Marc_tools/run_damask_lmp b/install/MarcMentat/2021.2/Marc_tools/run_damask_lmp similarity index 100% rename from installation/MarcMentat/2021.2/Marc_tools/run_damask_lmp rename to install/MarcMentat/2021.2/Marc_tools/run_damask_lmp diff --git a/installation/MarcMentat/2021.2/Marc_tools/run_damask_mp b/install/MarcMentat/2021.2/Marc_tools/run_damask_mp similarity index 100% rename from installation/MarcMentat/2021.2/Marc_tools/run_damask_mp rename to install/MarcMentat/2021.2/Marc_tools/run_damask_mp diff --git a/installation/MarcMentat/2021.2/Marc_tools/run_marc.original b/install/MarcMentat/2021.2/Marc_tools/run_marc.original similarity index 100% rename from installation/MarcMentat/2021.2/Marc_tools/run_marc.original rename to install/MarcMentat/2021.2/Marc_tools/run_marc.original diff --git a/installation/MarcMentat/2021.2/Mentat_bin/edit_window b/install/MarcMentat/2021.2/Mentat_bin/edit_window similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_bin/edit_window rename to install/MarcMentat/2021.2/Mentat_bin/edit_window diff --git a/installation/MarcMentat/2021.2/Mentat_bin/edit_window.original b/install/MarcMentat/2021.2/Mentat_bin/edit_window.original similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_bin/edit_window.original rename to install/MarcMentat/2021.2/Mentat_bin/edit_window.original diff --git a/installation/MarcMentat/2021.2/Mentat_bin/kill1.original b/install/MarcMentat/2021.2/Mentat_bin/kill1.original similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_bin/kill1.original rename to install/MarcMentat/2021.2/Mentat_bin/kill1.original diff --git a/installation/MarcMentat/2021.2/Mentat_bin/kill4 b/install/MarcMentat/2021.2/Mentat_bin/kill4 similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_bin/kill4 rename to install/MarcMentat/2021.2/Mentat_bin/kill4 diff --git a/installation/MarcMentat/2021.2/Mentat_bin/kill5 b/install/MarcMentat/2021.2/Mentat_bin/kill5 similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_bin/kill5 rename to install/MarcMentat/2021.2/Mentat_bin/kill5 diff --git a/installation/MarcMentat/2021.2/Mentat_bin/kill6 b/install/MarcMentat/2021.2/Mentat_bin/kill6 similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_bin/kill6 rename to install/MarcMentat/2021.2/Mentat_bin/kill6 diff --git a/installation/MarcMentat/2021.2/Mentat_bin/submit1.original b/install/MarcMentat/2021.2/Mentat_bin/submit1.original similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_bin/submit1.original rename to install/MarcMentat/2021.2/Mentat_bin/submit1.original diff --git a/installation/MarcMentat/2021.2/Mentat_bin/submit4 b/install/MarcMentat/2021.2/Mentat_bin/submit4 similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_bin/submit4 rename to install/MarcMentat/2021.2/Mentat_bin/submit4 diff --git a/installation/MarcMentat/2021.2/Mentat_bin/submit5 b/install/MarcMentat/2021.2/Mentat_bin/submit5 similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_bin/submit5 rename to install/MarcMentat/2021.2/Mentat_bin/submit5 diff --git a/installation/MarcMentat/2021.2/Mentat_bin/submit6 b/install/MarcMentat/2021.2/Mentat_bin/submit6 similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_bin/submit6 rename to install/MarcMentat/2021.2/Mentat_bin/submit6 diff --git a/installation/MarcMentat/2021.2/Mentat_menus/job_run.ms b/install/MarcMentat/2021.2/Mentat_menus/job_run.ms similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_menus/job_run.ms rename to install/MarcMentat/2021.2/Mentat_menus/job_run.ms diff --git a/installation/MarcMentat/2021.2/Mentat_menus/job_run.ms.original b/install/MarcMentat/2021.2/Mentat_menus/job_run.ms.original similarity index 100% rename from installation/MarcMentat/2021.2/Mentat_menus/job_run.ms.original rename to install/MarcMentat/2021.2/Mentat_menus/job_run.ms.original diff --git a/installation/MarcMentat/apply_DAMASK_modifications.py b/install/MarcMentat/apply_DAMASK_modifications.py similarity index 92% rename from installation/MarcMentat/apply_DAMASK_modifications.py rename to install/MarcMentat/apply_DAMASK_modifications.py index 6d1630c00..ba605b7db 100755 --- a/installation/MarcMentat/apply_DAMASK_modifications.py +++ b/install/MarcMentat/apply_DAMASK_modifications.py @@ -37,7 +37,7 @@ msc_version = args.msc_version print('adapting Marc tools...\n') -src = damask_root/f'installation/MarcMentat/{msc_version}/Marc_tools' +src = damask_root/f'install/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,args.msc_root,args.editor) @@ -45,12 +45,12 @@ for in_file in glob.glob(str(src/'*damask*')) + [str(src/'include_linux64')]: print('adapting Mentat scripts and menus...\n') -src = damask_root/f'installation/MarcMentat/{msc_version}/Mentat_bin' +src = damask_root/f'install/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,args.msc_root,args.editor) -src = damask_root/f'installation/MarcMentat/{msc_version}/Mentat_menus' +src = damask_root/f'install/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,args.msc_root,args.editor) diff --git a/installation/MarcMentat/installation.txt b/install/MarcMentat/installation.txt similarity index 100% rename from installation/MarcMentat/installation.txt rename to install/MarcMentat/installation.txt