diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b17fe1d27..31580458f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,6 @@ checkout: - git checkout $CI_COMMIT_SHA - git submodule update --init - source env/DAMASK.sh - - ./installation/symlink_Processing.py except: - master - release diff --git a/PRIVATE b/PRIVATE index 73f69c191..6bca1f57b 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 73f69c191ab7910d938b98daae0925f636b9cb57 +Subproject commit 6bca1f57bcdffacb8076466ecad73cdc44e965f9 diff --git a/installation/mods_MarcMentat/2020/Marc_tools/comp_damask_hmp b/installation/MarcMentat/2020/Marc_tools/comp_damask_hmp similarity index 100% rename from installation/mods_MarcMentat/2020/Marc_tools/comp_damask_hmp rename to installation/MarcMentat/2020/Marc_tools/comp_damask_hmp diff --git a/installation/mods_MarcMentat/2020/Marc_tools/comp_damask_lmp b/installation/MarcMentat/2020/Marc_tools/comp_damask_lmp similarity index 100% rename from installation/mods_MarcMentat/2020/Marc_tools/comp_damask_lmp rename to installation/MarcMentat/2020/Marc_tools/comp_damask_lmp diff --git a/installation/mods_MarcMentat/2020/Marc_tools/comp_damask_mp b/installation/MarcMentat/2020/Marc_tools/comp_damask_mp similarity index 100% rename from installation/mods_MarcMentat/2020/Marc_tools/comp_damask_mp rename to installation/MarcMentat/2020/Marc_tools/comp_damask_mp diff --git a/installation/mods_MarcMentat/2020/Marc_tools/comp_user.original b/installation/MarcMentat/2020/Marc_tools/comp_user.original similarity index 100% rename from installation/mods_MarcMentat/2020/Marc_tools/comp_user.original rename to installation/MarcMentat/2020/Marc_tools/comp_user.original diff --git a/installation/mods_MarcMentat/2020/Marc_tools/include_linux64 b/installation/MarcMentat/2020/Marc_tools/include_linux64 similarity index 100% rename from installation/mods_MarcMentat/2020/Marc_tools/include_linux64 rename to installation/MarcMentat/2020/Marc_tools/include_linux64 diff --git a/installation/mods_MarcMentat/2020/Marc_tools/include_linux64.original b/installation/MarcMentat/2020/Marc_tools/include_linux64.original similarity index 100% rename from installation/mods_MarcMentat/2020/Marc_tools/include_linux64.original rename to installation/MarcMentat/2020/Marc_tools/include_linux64.original diff --git a/installation/mods_MarcMentat/2020/Marc_tools/run_damask_hmp b/installation/MarcMentat/2020/Marc_tools/run_damask_hmp similarity index 100% rename from installation/mods_MarcMentat/2020/Marc_tools/run_damask_hmp rename to installation/MarcMentat/2020/Marc_tools/run_damask_hmp diff --git a/installation/mods_MarcMentat/2020/Marc_tools/run_damask_lmp b/installation/MarcMentat/2020/Marc_tools/run_damask_lmp similarity index 100% rename from installation/mods_MarcMentat/2020/Marc_tools/run_damask_lmp rename to installation/MarcMentat/2020/Marc_tools/run_damask_lmp diff --git a/installation/mods_MarcMentat/2020/Marc_tools/run_damask_mp b/installation/MarcMentat/2020/Marc_tools/run_damask_mp similarity index 100% rename from installation/mods_MarcMentat/2020/Marc_tools/run_damask_mp rename to installation/MarcMentat/2020/Marc_tools/run_damask_mp diff --git a/installation/mods_MarcMentat/2020/Marc_tools/run_marc.original b/installation/MarcMentat/2020/Marc_tools/run_marc.original similarity index 100% rename from installation/mods_MarcMentat/2020/Marc_tools/run_marc.original rename to installation/MarcMentat/2020/Marc_tools/run_marc.original diff --git a/installation/mods_MarcMentat/2020/Mentat_bin/edit_window b/installation/MarcMentat/2020/Mentat_bin/edit_window similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_bin/edit_window rename to installation/MarcMentat/2020/Mentat_bin/edit_window diff --git a/installation/mods_MarcMentat/2020/Mentat_bin/edit_window.original b/installation/MarcMentat/2020/Mentat_bin/edit_window.original similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_bin/edit_window.original rename to installation/MarcMentat/2020/Mentat_bin/edit_window.original diff --git a/installation/mods_MarcMentat/2020/Mentat_bin/kill1.original b/installation/MarcMentat/2020/Mentat_bin/kill1.original similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_bin/kill1.original rename to installation/MarcMentat/2020/Mentat_bin/kill1.original diff --git a/installation/mods_MarcMentat/2020/Mentat_bin/kill4 b/installation/MarcMentat/2020/Mentat_bin/kill4 similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_bin/kill4 rename to installation/MarcMentat/2020/Mentat_bin/kill4 diff --git a/installation/mods_MarcMentat/2020/Mentat_bin/kill5 b/installation/MarcMentat/2020/Mentat_bin/kill5 similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_bin/kill5 rename to installation/MarcMentat/2020/Mentat_bin/kill5 diff --git a/installation/mods_MarcMentat/2020/Mentat_bin/kill6 b/installation/MarcMentat/2020/Mentat_bin/kill6 similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_bin/kill6 rename to installation/MarcMentat/2020/Mentat_bin/kill6 diff --git a/installation/mods_MarcMentat/2020/Mentat_bin/submit1.original b/installation/MarcMentat/2020/Mentat_bin/submit1.original similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_bin/submit1.original rename to installation/MarcMentat/2020/Mentat_bin/submit1.original diff --git a/installation/mods_MarcMentat/2020/Mentat_bin/submit4 b/installation/MarcMentat/2020/Mentat_bin/submit4 similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_bin/submit4 rename to installation/MarcMentat/2020/Mentat_bin/submit4 diff --git a/installation/mods_MarcMentat/2020/Mentat_bin/submit5 b/installation/MarcMentat/2020/Mentat_bin/submit5 similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_bin/submit5 rename to installation/MarcMentat/2020/Mentat_bin/submit5 diff --git a/installation/mods_MarcMentat/2020/Mentat_bin/submit6 b/installation/MarcMentat/2020/Mentat_bin/submit6 similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_bin/submit6 rename to installation/MarcMentat/2020/Mentat_bin/submit6 diff --git a/installation/mods_MarcMentat/2020/Mentat_menus/job_run.ms b/installation/MarcMentat/2020/Mentat_menus/job_run.ms similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_menus/job_run.ms rename to installation/MarcMentat/2020/Mentat_menus/job_run.ms diff --git a/installation/mods_MarcMentat/2020/Mentat_menus/job_run.ms.original b/installation/MarcMentat/2020/Mentat_menus/job_run.ms.original similarity index 100% rename from installation/mods_MarcMentat/2020/Mentat_menus/job_run.ms.original rename to installation/MarcMentat/2020/Mentat_menus/job_run.ms.original diff --git a/installation/mods_MarcMentat/apply_DAMASK_modifications.py b/installation/MarcMentat/apply_DAMASK_modifications.py similarity index 100% rename from installation/mods_MarcMentat/apply_DAMASK_modifications.py rename to installation/MarcMentat/apply_DAMASK_modifications.py diff --git a/installation/mods_MarcMentat/installation.txt b/installation/MarcMentat/installation.txt similarity index 100% rename from installation/mods_MarcMentat/installation.txt rename to installation/MarcMentat/installation.txt diff --git a/installation/symlink_Processing.py b/installation/symlink_Processing.py deleted file mode 100755 index ef2274028..000000000 --- a/installation/symlink_Processing.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python3 - -# Makes postprocessing routines accessible from everywhere. -import sys -from pathlib import Path -import os - -bin_dir = Path(os.environ['DAMASK_ROOT'])/'bin' - -if not bin_dir.exists(): - bin_dir.mkdir() - - -sys.stdout.write('\nsymbolic linking...\n') -for sub_dir in ['pre','post']: - the_dir = Path(os.environ['DAMASK_ROOT'])/'processing'/sub_dir - - for the_file in the_dir.glob('*.py'): - src = the_dir/the_file - dst = bin_dir/Path(the_file.with_suffix('').name) - if dst.is_file(): dst.unlink() # dst.unlink(True) for Python >3.8 - dst.symlink_to(src) - - -sys.stdout.write('\npruning broken links...\n') -for filename in bin_dir.glob('*'): - if not filename.is_file(): - filename.unlink()