223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Martin Diehl 2017-05-15 15:48:24 +02:00
parent eeed5c7641 9724c95f58
commit 3633a036cd
10 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -485,8 +485,8 @@ backupData:
- mkdir $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA} - mkdir $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}
- cp $TESTROOT/time.txt $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}/ - mv $TESTROOT/time.png $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/
- cp $TESTROOT/time.txt $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/ - cp $TESTROOT/memory.txt $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/
- mv $TESTROOT/time.png $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}/ - mv $DAMASKROOT/PRIVATE/documenting/DAMASK_* $BACKUP/${CI_PIPELINE_ID}_${CI_COMMIT_SHA}/
except: except:
- master - master

2
PRIVATE

@ -1 +1 @@
Subproject commit a629ee95c53924f2da16e8981855f9abcc1d50f7 Subproject commit 19a53f6229603aeafb2466b58679a1cd04fc0142

2
VERSION
View File

@ -1 +1 @@
v2.0.1-715-g5d58752 v2.0.1-719-g4f3b0e4

1
src/DAMASK_marc2011.f90
View File

@ -1 +0,0 @@
DAMASK_marc.f90

1
src/DAMASK_marc2012.f90
View File

@ -1 +0,0 @@
DAMASK_marc.f90

1
src/DAMASK_marc2013.1.f90
View File

@ -1 +0,0 @@
DAMASK_marc.f90

1
src/DAMASK_marc2013.f90
View File

@ -1 +0,0 @@
DAMASK_marc.f90

1
src/DAMASK_marc2014.2.f90
View File

@ -1 +0,0 @@
DAMASK_marc.f90

1
src/DAMASK_marc2014.f90
View File

@ -1 +0,0 @@
DAMASK_marc.f90

1
src/DAMASK_marc2015.f90
View File

@ -1 +0,0 @@
DAMASK_marc.f90