From 7da8bc8d4a890053c3246d9327fe9dd8a7d28f24 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 16 May 2017 11:10:01 +0200 Subject: [PATCH] symlinks can be handled by Git, so we can store them and simplify the installation --- installation/mods_MarcMentat/apply_DAMASK_modifications.sh | 7 +------ src/.gitignore | 1 - src/DAMASK_marc2014.2.f90 | 1 + src/DAMASK_marc2014.f90 | 1 + src/DAMASK_marc2015.f90 | 1 + src/DAMASK_marc2016.f90 | 1 + 6 files changed, 5 insertions(+), 7 deletions(-) create mode 120000 src/DAMASK_marc2014.2.f90 create mode 120000 src/DAMASK_marc2014.f90 create mode 120000 src/DAMASK_marc2015.f90 create mode 120000 src/DAMASK_marc2016.f90 diff --git a/installation/mods_MarcMentat/apply_DAMASK_modifications.sh b/installation/mods_MarcMentat/apply_DAMASK_modifications.sh index 761883de5..d1c1e37dd 100755 --- a/installation/mods_MarcMentat/apply_DAMASK_modifications.sh +++ b/installation/mods_MarcMentat/apply_DAMASK_modifications.sh @@ -129,7 +129,7 @@ for filename in marc$VERSION/tools/run_damask* \ chmod 755 $INSTALLDIR/${filename} done -#creating symlinks for run_damask_scripts in /usr/local/bin +#creating symlinks for run_damask_scripts if [ -d "$BIN_DIR" ]; then echo '' @@ -158,11 +158,6 @@ if [ -d "$BIN_DIR" ]; then esac fi -# cloning user subroutine -echo '' -echo 'cloning $VERSION HYPELA2 user subroutine...' -ln -s DAMASK_marc.f90 ${DAMASK_ROOT}/src/DAMASK_marc${VERSION}.f90 - # precompiling user subroutine echo '' echo 'precompiling $VERSION HYPELA2 user subroutine...' diff --git a/src/.gitignore b/src/.gitignore index c90e213cf..e9956554e 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,4 +1,3 @@ -DAMASK_marc*.f90 Makefile cmake_install.cmake quit__genmod.f90 diff --git a/src/DAMASK_marc2014.2.f90 b/src/DAMASK_marc2014.2.f90 new file mode 120000 index 000000000..2c5bec706 --- /dev/null +++ b/src/DAMASK_marc2014.2.f90 @@ -0,0 +1 @@ +DAMASK_marc.f90 \ No newline at end of file diff --git a/src/DAMASK_marc2014.f90 b/src/DAMASK_marc2014.f90 new file mode 120000 index 000000000..2c5bec706 --- /dev/null +++ b/src/DAMASK_marc2014.f90 @@ -0,0 +1 @@ +DAMASK_marc.f90 \ No newline at end of file diff --git a/src/DAMASK_marc2015.f90 b/src/DAMASK_marc2015.f90 new file mode 120000 index 000000000..2c5bec706 --- /dev/null +++ b/src/DAMASK_marc2015.f90 @@ -0,0 +1 @@ +DAMASK_marc.f90 \ No newline at end of file diff --git a/src/DAMASK_marc2016.f90 b/src/DAMASK_marc2016.f90 new file mode 120000 index 000000000..2c5bec706 --- /dev/null +++ b/src/DAMASK_marc2016.f90 @@ -0,0 +1 @@ +DAMASK_marc.f90 \ No newline at end of file