Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development

2017-05-15 15:48:24 +02:00 · 2017-05-15 15:48:24 +02:00 · 3633a036cd
parent eeed5c7641 9724c95f58
commit 3633a036cd
10 changed files with 4 additions and 11 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -485,8 +485,8 @@ backupData:
    - mkdir $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}
    - cp $TESTROOT/time.txt $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/
    - mv $TESTROOT/time.png $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/
-    - cp $TESTROOT/time.txt $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/
-    - mv $TESTROOT/time.png $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/
+    - cp $TESTROOT/memory.txt $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/
+    - mv $TESTROOT/memory.png $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/
    - mv $DAMASKROOT/PRIVATE/documenting/DAMASK_* $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/
  except:
    - master
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit a629ee95c53924f2da16e8981855f9abcc1d50f7
+Subproject commit 19a53f6229603aeafb2466b58679a1cd04fc0142
--- a/2
+++ b/2
@ -1 +1 @@
-v2.0.1-715-g5d58752
+v2.0.1-719-g4f3b0e4
--- a/src/DAMASK_marc2011.f90
+++ b/src/DAMASK_marc2011.f90
@ -1 +0,0 @@
-DAMASK_marc.f90
--- a/src/DAMASK_marc2012.f90
+++ b/src/DAMASK_marc2012.f90
@ -1 +0,0 @@
-DAMASK_marc.f90
--- a/src/DAMASK_marc2013.1.f90
+++ b/src/DAMASK_marc2013.1.f90
@ -1 +0,0 @@
-DAMASK_marc.f90
--- a/src/DAMASK_marc2013.f90
+++ b/src/DAMASK_marc2013.f90
@ -1 +0,0 @@
-DAMASK_marc.f90
--- a/src/DAMASK_marc2014.2.f90
+++ b/src/DAMASK_marc2014.2.f90
@ -1 +0,0 @@
-DAMASK_marc.f90
--- a/src/DAMASK_marc2014.f90
+++ b/src/DAMASK_marc2014.f90
@ -1 +0,0 @@
-DAMASK_marc.f90
--- a/src/DAMASK_marc2015.f90
+++ b/src/DAMASK_marc2015.f90
@ -1 +0,0 @@
-DAMASK_marc.f90