From 93c5f9adc7c5354b022d9382fb0efc0b6b26feea Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 6 Mar 2017 04:40:08 +0100 Subject: [PATCH 01/49] updated version information after successful test of v2.0.1-400-g64a6476 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3f6b37f8f..cf8e44488 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-393-gf010aa9 +v2.0.1-400-g64a6476 From 0d648b8de04c727f7790b0aeb4c6bb1fbf7e8bf3 Mon Sep 17 00:00:00 2001 From: brendanvk Date: Tue, 7 Mar 2017 20:37:30 -0500 Subject: [PATCH 02/49] Change script to use resolution-independent coords - Use the --voxelspace flag to get the old behavior --- processing/pre/geom_addPrimitive.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/processing/pre/geom_addPrimitive.py b/processing/pre/geom_addPrimitive.py index 349708b3b..51dc1db3c 100755 --- a/processing/pre/geom_addPrimitive.py +++ b/processing/pre/geom_addPrimitive.py @@ -48,14 +48,17 @@ parser.add_option( '--degrees', dest='degrees', action='store_true', help = 'angle is given in degrees [%default]') parser.add_option( '--nonperiodic', dest='periodic', action='store_false', help = 'wrap around edges [%default]') - +parser.add_option( '--voxelspace', dest='voxelspace', action='store_true', + help = '-c and -d are given in (0 to grid) coordinates instead of (origin to origin+size) \ +coordinates [%default]') parser.set_defaults(center = [0,0,0], fill = 0, quaternion = [], angleaxis = [], degrees = False, exponent = [1e10,1e10,1e10], # box shape by default - periodic = True + periodic = True, + voxelspace = False ) (options, filenames) = parser.parse_args() @@ -71,6 +74,7 @@ else: rotation = damask.Quaternion() options.center = np.array(options.center) +options.dimension = np.array(options.dimension) # --- loop over input files ------------------------------------------------------------------------- if filenames == []: filenames = [None] @@ -117,9 +121,14 @@ for name in filenames: # If we have a negative dimension, make it an ellipsoid for backwards compatibility options.exponent = np.where(np.array(options.dimension) > 0, options.exponent, 2) - microstructure = microstructure.reshape(info['grid'],order='F') + # coordinates given in real space (default) vs voxel space + if not options.voxelspace: + options.center += info['origin'] + options.center *= np.array(info['grid']) / np.array(info['size']) + options.dimension *= np.array(info['grid']) / np.array(info['size']) + size = microstructure.shape # change to coordinate space where the primitive is the unit sphere/cube/etc From d6b971734180bdb47f2f7867b1c56621085574b1 Mon Sep 17 00:00:00 2001 From: Test User Date: Wed, 8 Mar 2017 16:26:27 +0100 Subject: [PATCH 03/49] updated version information after successful test of v2.0.1-402-g0d648b8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cf8e44488..4e401e051 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-400-g64a6476 +v2.0.1-402-g0d648b8 From 709c8c287bd93d86931598a46b96714b0a5aeafd Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 18 Mar 2017 12:10:10 +0100 Subject: [PATCH 04/49] updated year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 5a76343a0..97d799216 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2011-16 Max-Planck-Institut für Eisenforschung GmbH +Copyright 2011-17 Max-Planck-Institut für Eisenforschung GmbH This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From f2ea0ccf58550436a52e53fc4d783ec2ce29a5aa Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 19 Mar 2017 16:28:12 +0100 Subject: [PATCH 05/49] updated version information after successful test of v2.0.1-404-g709c8c2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4e401e051..80563714f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-402-g0d648b8 +v2.0.1-404-g709c8c2 From 66b4e24ab75ea341e22510aecf0d496856088cd5 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Mon, 20 Mar 2017 15:13:54 -0400 Subject: [PATCH 06/49] solver.Marc.version has no argument anymore --- processing/post/postResults.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/processing/post/postResults.py b/processing/post/postResults.py index a3501bc81..23550e980 100755 --- a/processing/post/postResults.py +++ b/processing/post/postResults.py @@ -851,7 +851,7 @@ for opt in ['nodalScalar','elemScalar','elemTensor','homogenizationResult','crys if options.info: if options.filetype == 'marc': - print('\n\nMentat release {}'.format(damask.solver.Marc().version('../../'))) + print('\n\nMentat release {}'.format(damask.solver.Marc().version())) if options.filetype == 'spectral': print('\n\n{}'.format(p)) From bdbaaa3ecf39c94a5ad76734a919f1db9a90b006 Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 21 Mar 2017 04:25:17 +0100 Subject: [PATCH 07/49] updated version information after successful test of v2.0.1-407-g8880986 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 80563714f..bf90fbdae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-404-g709c8c2 +v2.0.1-407-g8880986 From 9493807c1d385fe061b5a13a8373f96067e12cd6 Mon Sep 17 00:00:00 2001 From: Franz Roters Date: Fri, 24 Mar 2017 10:54:34 +0100 Subject: [PATCH 08/49] adapted to new license server --- lib/damask/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/damask/environment.py b/lib/damask/environment.py index a37f9dc5c..6ec0bff79 100644 --- a/lib/damask/environment.py +++ b/lib/damask/environment.py @@ -33,7 +33,7 @@ class Environment(): 'explicit':5} if Nneeded == -1: Nneeded = licensesNeeded[software] try: - cmd = """ ssh mulicense2 "/Stat_Flexlm | grep 'Users of %s: ' | cut -d' ' -f7,13" """%software + cmd = """ ssh mulicense2 "/lm-status | grep 'Users of %s: ' | cut -d' ' -f7,13" """%software process = subprocess.Popen(shlex.split(cmd),stdout = subprocess.PIPE,stderr = subprocess.PIPE) licenses = list(map(int, process.stdout.readline().split())) try: From 855c76646807f17674af9d4dca30e7fe1420d463 Mon Sep 17 00:00:00 2001 From: Test User Date: Fri, 24 Mar 2017 16:25:47 +0100 Subject: [PATCH 09/49] updated version information after successful test of v2.0.1-409-g9493807 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index bf90fbdae..1028e7cfe 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-407-g8880986 +v2.0.1-409-g9493807 From 0e0e6addda83fc0244ec7cedae02b5298d268cdb Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 2 Apr 2017 23:17:22 +0200 Subject: [PATCH 10/49] reference for qRand --- code/math.f90 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/math.f90 b/code/math.f90 index 315da2642..e62fe60c3 100644 --- a/code/math.f90 +++ b/code/math.f90 @@ -1181,6 +1181,9 @@ end function math_Voigt66to3333 !-------------------------------------------------------------------------------------------------- !> @brief random quaternion +! http://math.stackexchange.com/questions/131336/uniform-random-quaternion-in-a-restricted-angle-range +! K. Shoemake. Uniform random rotations. In D. Kirk, editor, Graphics Gems III, pages 124-132. +! Academic, New York, 1992. !-------------------------------------------------------------------------------------------------- function math_qRand() From f152e81fcd184d36293caa13efab19d9e10ffca6 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 3 Apr 2017 04:25:09 +0200 Subject: [PATCH 11/49] updated version information after successful test of v2.0.1-411-g0e0e6ad --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1028e7cfe..0903cb219 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-409-g9493807 +v2.0.1-411-g0e0e6ad From 23ecffa2e57d89d5a91429000097ba90e492605c Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 10 Apr 2017 18:04:26 +0200 Subject: [PATCH 12/49] path sep does not change --- code/spectral_interface.f90 | 52 ++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 27 deletions(-) diff --git a/code/spectral_interface.f90 b/code/spectral_interface.f90 index fdef1a9fb..6425480af 100644 --- a/code/spectral_interface.f90 +++ b/code/spectral_interface.f90 @@ -20,7 +20,6 @@ module DAMASK_interface geometryFile = '', & !< parameter given for geometry file loadCaseFile = '' !< parameter given for load case file character(len=1024), private :: workingDirectory !< accessed by getSolverWorkingDirectoryName for compatibility reasons - character, private,parameter :: pathSep = '/' public :: & getSolverWorkingDirectoryName, & @@ -168,7 +167,7 @@ subroutine DAMASK_interface_init() write(6,'(a)') ' Help:' write(6,'(/,a)')' --help' write(6,'(a,/)')' Prints this message and exits' - call quit(0_pInt) ! normal Termination + call quit(0_pInt) ! normal Termination case ('-l', '--load', '--loadcase') loadcaseArg = IIO_stringValue(commandLine,chunkPos,i+1_pInt) case ('-g', '--geom', '--geometry') @@ -194,7 +193,6 @@ subroutine DAMASK_interface_init() error = getHostName(hostName) write(6,'(a,a)') ' Host name: ', trim(hostName) write(6,'(a,a)') ' User name: ', trim(userName) - write(6,'(a,a)') ' Path separator: ', pathSep write(6,'(a,a)') ' Command line call: ', trim(commandLine) if (len(trim(workingDirArg))>0) & write(6,'(a,a)') ' Working dir argument: ', trim(workingDirArg) @@ -229,22 +227,22 @@ character(len=1024) function storeWorkingDirectory(workingDirectoryArg,geometryA external :: quit wdGiven: if (len(workingDirectoryArg)>0) then - absolutePath: if (workingDirectoryArg(1:1) == pathSep) then + absolutePath: if (workingDirectoryArg(1:1) == '/') then storeWorkingDirectory = workingDirectoryArg else absolutePath error = getCWD(cwd) if (error) call quit(1_pInt) - storeWorkingDirectory = trim(cwd)//pathSep//workingDirectoryArg + storeWorkingDirectory = trim(cwd)//'/'//workingDirectoryArg endif absolutePath - if (storeWorkingDirectory(len(trim(storeWorkingDirectory)):len(trim(storeWorkingDirectory))) /= pathSep) & - storeWorkingDirectory = trim(storeWorkingDirectory)//pathSep ! if path seperator is not given, append it + if (storeWorkingDirectory(len(trim(storeWorkingDirectory)):len(trim(storeWorkingDirectory))) /= '/') & + storeWorkingDirectory = trim(storeWorkingDirectory)//'/' ! if path seperator is not given, append it else wdGiven - if (geometryArg(1:1) == pathSep) then ! absolute path given as command line argument - storeWorkingDirectory = geometryArg(1:scan(geometryArg,pathSep,back=.true.)) + if (geometryArg(1:1) == '/') then ! absolute path given as command line argument + storeWorkingDirectory = geometryArg(1:scan(geometryArg,'/',back=.true.)) else error = getCWD(cwd) ! relative path given as command line argument if (error) call quit(1_pInt) - storeWorkingDirectory = trim(cwd)//pathSep//geometryArg(1:scan(geometryArg,pathSep,back=.true.)) + storeWorkingDirectory = trim(cwd)//'/'//geometryArg(1:scan(geometryArg,'/',back=.true.)) endif endif wdGiven @@ -281,13 +279,13 @@ character(len=1024) function getSolverJobName() tempString = geometryFile posExt = scan(tempString,'.',back=.true.) - posSep = scan(tempString,pathSep,back=.true.) + posSep = scan(tempString,'/',back=.true.) getSolverJobName = tempString(posSep+1:posExt-1) tempString = loadCaseFile posExt = scan(tempString,'.',back=.true.) - posSep = scan(tempString,pathSep,back=.true.) + posSep = scan(tempString,'/',back=.true.) getSolverJobName = trim(getSolverJobName)//'_'//tempString(posSep+1:posExt-1) @@ -312,13 +310,13 @@ character(len=1024) function getGeometryFile(geometryParameter) getGeometryFile = geometryParameter posExt = scan(getGeometryFile,'.',back=.true.) - posSep = scan(getGeometryFile,pathSep,back=.true.) + posSep = scan(getGeometryFile,'/',back=.true.) if (posExt <= posSep) getGeometryFile = trim(getGeometryFile)//('.geom') ! no extension present - if (scan(getGeometryFile,pathSep) /= 1) then ! relative path given as command line argument + if (scan(getGeometryFile,'/') /= 1) then ! relative path given as command line argument error = getcwd(cwd) if (error) call quit(1_pInt) - getGeometryFile = rectifyPath(trim(cwd)//pathSep//getGeometryFile) + getGeometryFile = rectifyPath(trim(cwd)//'/'//getGeometryFile) else getGeometryFile = rectifyPath(getGeometryFile) endif @@ -346,13 +344,13 @@ character(len=1024) function getLoadCaseFile(loadCaseParameter) getLoadCaseFile = loadcaseParameter posExt = scan(getLoadCaseFile,'.',back=.true.) - posSep = scan(getLoadCaseFile,pathSep,back=.true.) + posSep = scan(getLoadCaseFile,'/',back=.true.) if (posExt <= posSep) getLoadCaseFile = trim(getLoadCaseFile)//('.load') ! no extension present - if (scan(getLoadCaseFile,pathSep) /= 1) then ! relative path given as command line argument + if (scan(getLoadCaseFile,'/') /= 1) then ! relative path given as command line argument error = getcwd(cwd) if (error) call quit(1_pInt) - getLoadCaseFile = rectifyPath(trim(cwd)//pathSep//getLoadCaseFile) + getLoadCaseFile = rectifyPath(trim(cwd)//'/'//getLoadCaseFile) else getLoadCaseFile = rectifyPath(getLoadCaseFile) endif @@ -377,26 +375,26 @@ function rectifyPath(path) l = len_trim(path) rectifyPath = path do i = l,3,-1 - if (rectifyPath(i-2:i) == pathSep//'.'//pathSep) & + if (rectifyPath(i-2:i) == '/'//'.'//'/') & rectifyPath(i-1:l) = rectifyPath(i+1:l)//' ' enddo !-------------------------------------------------------------------------------------------------- ! remove ../ and corresponding directory from rectifyPath l = len_trim(rectifyPath) - i = index(rectifyPath(i:l),'..'//pathSep) + i = index(rectifyPath(i:l),'..'//'/') j = 0 do while (i > j) - j = scan(rectifyPath(1:i-2),pathSep,back=.true.) + j = scan(rectifyPath(1:i-2),'/',back=.true.) rectifyPath(j+1:l) = rectifyPath(i+3:l)//repeat(' ',2+i-j) - if (rectifyPath(j+1:j+1) == pathSep) then !search for '//' that appear in case of XXX/../../XXX + if (rectifyPath(j+1:j+1) == '/') then !search for '//' that appear in case of XXX/../../XXX k = len_trim(rectifyPath) rectifyPath(j+1:k-1) = rectifyPath(j+2:k) rectifyPath(k:k) = ' ' endif - i = j+index(rectifyPath(j+1:l),'..'//pathSep) + i = j+index(rectifyPath(j+1:l),'..'//'/') enddo - if(len_trim(rectifyPath) == 0) rectifyPath = pathSep + if(len_trim(rectifyPath) == 0) rectifyPath = '/' end function rectifyPath @@ -415,12 +413,12 @@ character(len=1024) function makeRelativePath(a,b) do i = 1, min(1024,len_trim(a),len_trim(b)) if (a(i:i) /= b(i:i)) exit - if (a(i:i) == pathSep) posLastCommonSlash = i + if (a(i:i) == '/') posLastCommonSlash = i enddo do i = posLastCommonSlash+1,len_trim(a) - if (a(i:i) == pathSep) remainingSlashes = remainingSlashes + 1 + if (a(i:i) == '/') remainingSlashes = remainingSlashes + 1 enddo - makeRelativePath = repeat('..'//pathSep,remainingSlashes)//b(posLastCommonSlash+1:len_trim(b)) + makeRelativePath = repeat('..'//'/',remainingSlashes)//b(posLastCommonSlash+1:len_trim(b)) end function makeRelativePath From 81d0752c43537c842121fc9a8182450ce85a40be Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 10 Apr 2017 18:27:07 +0200 Subject: [PATCH 13/49] check for correct PETSc version --- code/spectral_interface.f90 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/code/spectral_interface.f90 b/code/spectral_interface.f90 index 6425480af..f37f083d6 100644 --- a/code/spectral_interface.f90 +++ b/code/spectral_interface.f90 @@ -95,7 +95,11 @@ subroutine DAMASK_interface_init() call quit(1_pInt) endif if (error_unit /= 0) then - write(output_unit,'(a)') ' STERR != 0' + write(output_unit,'(a)') ' STDERR != 0' + call quit(1_pInt) + endif + if (PETSC_VERSION_MAJOR /= 3 .or. PETSC_VERSION_MINOR /= 7) then + write(6,'(a,2(i1.1,a))') 'PETSc ',PETSC_VERSION_MAJOR,'.',PETSC_VERSION_MINOR,'.x not supported' call quit(1_pInt) endif else mainProcess From c6ae296eb26a03b774fce4cefec6f2d0d2a325c9 Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 11 Apr 2017 04:39:11 +0200 Subject: [PATCH 14/49] updated version information after successful test of v2.0.1-414-g81d0752 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0903cb219..1d89fa753 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-411-g0e0e6ad +v2.0.1-414-g81d0752 From 086fffc1b4c3e1bbe3fc45a5d85a0e61aa7cf241 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 13:16:27 +0200 Subject: [PATCH 15/49] using gitlab CI --- .gitlab-ci.yml | 336 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 336 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..17df28dbc --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,336 @@ +stages: + - prepareAll + - preprocessing + - postprocessing + - compileSpectralIntel + - compileSpectralGNU + - prepareSpectral + - spectral + - compileMarc2014 + - compileMarc2014.2 + - compileMarc2015 + - compileMarc2016 + - marc + - compileAbaqus2016 + - compileAbaqus2017 + - example + - updateMaster + - createDocumentation + +################################################################################################### +before_script: + - eval 'source $DAMASKROOT/DAMASK_env.sh' + - module purge + - cd $DAMASKROOT/PRIVATE/testing + +################################################################################################### +variables: + #================================================================================================ + # GitLab Settings + #================================================================================================ + GIT_SUBMODULE_STRATEGY: none + + #================================================================================================ + # Shortcut names + #================================================================================================ + DAMASKROOT: "$HOME/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" + + #================================================================================================ + # Names of module files to load + #================================================================================================ + # ++++++++++++ Compiler ++++++++++++++++++++++++++++++++++++++++++++++ + IntelCompiler16_0: "Compiler/Intel/16.0 Libraries/IMKL/2016" + IntelCompiler17_0: "Compiler/Intel/17.0 Libraries/IMKL/2017" + GNUCompiler5_3: "Compiler/GNU/5.3" + # ------------ Defaults ---------------------------------------------- + IntelCompiler: "$IntelCompiler17_0" + GNUCompiler: "$GNUCompiler5_3" + # ++++++++++++ MPI +++++++++++++++++++++++++++++++++++++++++++++++++++ + MPICH3_2Intel17_0: "MPI/Intel/17.0/MPICH/3.2" + MPICH3_2GNU5_3: "MPI/GNU/5.3/MPICH/3.2" + # ------------ Defaults ---------------------------------------------- + MPICH_GNU: "$MPICH3_2GNU5_3" + MPICH_Intel: "$MPICH3_2Intel17_0" + # ++++++++++++ PETSc +++++++++++++++++++++++++++++++++++++++++++++++++ + PETSc3_6_4MPICH3_2Intel17_0: "Libraries/PETSc/3.6.4/Intel-17.0-MPICH-3.2" + PETSc3_7_5MPICH3_2Intel17_0: "Libraries/PETSc/3.7.5/Intel-17.0-MPICH-3.2" + PETSc3_7_5MPICH3_2GNU5_3: "Libraries/PETSc/3.7.5/GNU-5.3-MPICH-3.2" + # ------------ Defaults ---------------------------------------------- + PETSc_MPICH_Intel: "$PETSc3_7_5MPICH3_2Intel17_0" + PETSc_MPICH_GNU: "$PETSc3_7_5MPICH3_2GNU5_3" + # ++++++++++++ FEM +++++++++++++++++++++++++++++++++++++++++++++++++++ + Abaqus2016: "FEM/Abaqus/2016" + Abaqus2017: "FEM/Abaqus/2017" + MSC2014: "FEM/MSC/2014" + MSC2014_2: "FEM/MSC/2014.2" + MSC2015: "FEM/MSC/2015" + MSC2016: "FEM/MSC/2016" + # ------------ Defaults ---------------------------------------------- + Abaqus: "$Abaqus2017" + MSC: "$MSC2016" + # ++++++++++++ Documentation +++++++++++++++++++++++++++++++++++++++++ + Doxygen1_8_13: "Documentation/Doxygen/1.8.13" + # ------------ Defaults ---------------------------------------------- + Doxygen: "$Doxygen1_8_13" + + +################################################################################################### +checkout: + stage: prepareAll + before_script: + - echo 'Do nothing' + script: + - mkdir /tmp/GitlabCI_Pipeline_$CI_PIPELINE_ID + - git clone -b GitLabRunner git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT + - git clone git@magit1.mpie.de:damask/PRIVATE.git $DAMASKROOT/PRIVATE + - eval 'source $DAMASKROOT/DAMASK_env.sh' + - make -C $DAMASKROOT install + +################################################################################################### +OrientationRelationship: + stage: preprocessing + script: OrientationRelationship/test.py + +Pre_SeedGeneration: + stage: preprocessing + script: PreProcessing_SeedGeneration/test.py + +Pre_GeomGeneration: + stage: preprocessing + script: PreProcessing_GeomGeneration/test.py + +Pre_GeomModification: + stage: preprocessing + script: PreProcessing_GeomModification/test.py + +Pre_General: + stage: preprocessing + script: PreProcessing/test.py + +Spectral_geometryPacking: + stage: preprocessing + script: Spectral_geometryPacking/test.py + +################################################################################################### +Post_General: + stage: postprocessing + script: PostProcessing/test.py + +Post_GeometryReconstruction: + stage: postprocessing + script: Spectral_geometryReconstruction/test.py + +Post_addCurl: + stage: postprocessing + script: addCurl/test.py + +Post_addDivergence: + stage: postprocessing + script: addDivergence/test.py + +Post_addGradient: + stage: postprocessing + script: addGradient/test.py + +Post_ParaviewRelated: + stage: postprocessing + script: ParaviewRelated/test.py + +################################################################################################### +Compile_Intel: + stage: compileSpectralIntel + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel + - SpectralAll_compileIfort/test.py + +################################################################################################### +Compile_GNU: + stage: compileSpectralGNU + script: + - module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU + - SpectralAll_compileGfortran/test.py + +################################################################################################### +Compile_Intel_Prepare: + stage: prepareSpectral + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel + - make -C $DAMASKROOT clean spectral install tidy + +################################################################################################### +Spectral_PackedGeometry: + stage: spectral + script: Spectral_PackedGeometry/test.py + +Spectral_parsingArguments: + stage: spectral + script: Spectral_parsingArguments/test.py + +StateIntegration_compareVariants: + stage: spectral + script: StateIntegration_compareVariants/test.py + +nonlocal_densityConservation: + stage: spectral + script: nonlocal_densityConservation/test.py + +Spectral_ipNeighborhood: + stage: spectral + script: Spectral_ipNeighborhood/test.py + +Nonlocal_Damage_DetectChanges: + stage: spectral + script: Nonlocal_Damage_DetectChanges/test.py + +SpectralAll_restart: + stage: spectral + script: SpectralAll_restart/test.py + +SpectralAll_parsingLoadCase: + stage: spectral + script: SpectralAll_parsingLoadCase/test.py + +SpectralBasic_loadCaseRotation: + stage: spectral + script: SpectralBasic_loadCaseRotation/test.py + +Spectral_MPI: + stage: spectral + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel + - Spectral_MPI/test.py + +Plasticity_DetectChanges: + stage: spectral + script: Plasticity_DetectChanges/test.py + +Homogenization: + stage: spectral + script: Homogenization/test.py + +Phenopowerlaw_singleSlip: + stage: spectral + script: Phenopowerlaw_singleSlip/test.py + +HybridIA: + stage: spectral + script: HybridIA/test.py + +################################################################################################### +Marc_compileIfort2014: + stage: compileMarc2014 + script: + - module load $IntelCompiler16_0 $MSC2014 + - Marc_compileIfort/test.py -m 2014 + +################################################################################################### +Marc_compileIfort2014.2: + stage: compileMarc2014.2 + script: + - module load $IntelCompiler16_0 $MSC2014_2 + - Marc_compileIfort/test.py -m 2014.2 + +################################################################################################### +Marc_compileIfort2015: + stage: compileMarc2015 + script: + - module load $IntelCompiler16_0 $MSC2015 + - Marc_compileIfort/test.py -m 2015 + +################################################################################################### +Marc_compileIfort2016: + stage: compileMarc2016 + script: + - module load $IntelCompiler16_0 $MSC2016 + - Marc_compileIfort/test.py -m 2016 + +################################################################################################### +Hex_elastic: + stage: marc + script: + - module load $IntelCompiler16_0 $MSC + - Hex_elastic/test.py + +CubicFCC_elastic: + stage: marc + script: + - module load $IntelCompiler16_0 $MSC + - CubicFCC_elastic/test.py + +CubicBCC_elastic: + stage: marc + script: + - module load $IntelCompiler16_0 $MSC + - CubicBCC_elastic/test.py + +J2_plasticBehavior: + stage: marc + script: + - module load $IntelCompiler16_0 $MSC + - J2_plasticBehavior/test.py + +################################################################################################### +Abaqus_compile2016: + stage: compileAbaqus2016 + script: + - module load $IntelCompiler16_0 $Abaqus2016 + - Abaqus_compileIfort/test.py -a 2016 + +################################################################################################### +Abaqus_compile2017: + stage: compileAbaqus2017 + script: + - module load $IntelCompiler16_0 $Abaqus2017 + - Abaqus_compileIfort/test.py -a 2017 + +################################################################################################### +SpectralExample: + stage: example + script: SpectralAll_example/test.py + +AbaqusExample: + stage: example + script: + - module load $IntelCompiler16_0 $Abaqus + - Abaqus_example/test.py + +################################################################################################### +mergeIntoMaster: + stage: updateMaster + only: + - development + script: + - eval 'cd $DAMASKROOT' + - export DEVREV=$(git describe) + - git commit VERSION -m "[skip ci] updated version information after successful test of $DEVREV" + - git checkout master + - git merge development + - git status + - git push origin master + - git checkout development + - git push origin development + +################################################################################################### +AbaqusExp: + stage: createDocumentation + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen + - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT abaqus_exp + +AbaqusStd: + stage: createDocumentation + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen + - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT abaqus_std + +Marc: + stage: createDocumentation + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen + - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT marc + +Spectral: + stage: createDocumentation + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen + - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT spectral From 29cabe1df26248e780721a75b3d96da9128fb15a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 13:19:36 +0200 Subject: [PATCH 16/49] /home/m is not defined --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17df28dbc..73145d38f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ variables: #================================================================================================ # Shortcut names #================================================================================================ - DAMASKROOT: "$HOME/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" + DAMASKROOT: "~/HOME/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" #================================================================================================ # Names of module files to load From 69d4e51ce0d17d7e030fb25d950d8e254f1eaa11 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 13:22:46 +0200 Subject: [PATCH 17/49] typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73145d38f..c4043a752 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ variables: #================================================================================================ # Shortcut names #================================================================================================ - DAMASKROOT: "~/HOME/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" + DAMASKROOT: "~/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" #================================================================================================ # Names of module files to load From b1ffe883befb9707b18c6d591970f63d8889e654 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 14:28:42 +0200 Subject: [PATCH 18/49] directory was not parameterized --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c4043a752..2c0565503 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -80,7 +80,7 @@ checkout: before_script: - echo 'Do nothing' script: - - mkdir /tmp/GitlabCI_Pipeline_$CI_PIPELINE_ID + - mkdir -p $DAMASKROOT - git clone -b GitLabRunner git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT - git clone git@magit1.mpie.de:damask/PRIVATE.git $DAMASKROOT/PRIVATE - eval 'source $DAMASKROOT/DAMASK_env.sh' From 3fc5d8c5f98bbf4efda3f3638e913a9480268111 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 14:38:23 +0200 Subject: [PATCH 19/49] set home in Gitlab settings --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2c0565503..583aa7b43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ variables: #================================================================================================ # Shortcut names #================================================================================================ - DAMASKROOT: "~/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" + DAMASKROOT: "$HOME/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" #================================================================================================ # Names of module files to load From f166ba4c9a63fc86bab3447359bf0ed54cc6f929 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 16:47:32 +0200 Subject: [PATCH 20/49] do long example runs only for development --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 583aa7b43..bcd694974 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -286,10 +286,14 @@ Abaqus_compile2017: ################################################################################################### SpectralExample: stage: example + only: + - development script: SpectralAll_example/test.py AbaqusExample: stage: example + only: + - development script: - module load $IntelCompiler16_0 $Abaqus - Abaqus_example/test.py From 4bcefa992bf8dbf0077b24b6293b9c7b310e208b Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 23:30:33 +0200 Subject: [PATCH 21/49] trying to avoid conflicts when updating master and development, only one pipeline at the same time --- .gitlab-ci.yml | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcd694974..7ee1d6884 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,7 @@ stages: - example - updateMaster - createDocumentation + - clean ################################################################################################### before_script: @@ -78,11 +79,14 @@ variables: checkout: stage: prepareAll before_script: - - echo 'Do nothing' + - $HOME/wait.sh + - echo $CI_PIPELINE_ID > $HOME/GitLabCI.lock script: - mkdir -p $DAMASKROOT - - git clone -b GitLabRunner git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT - - git clone git@magit1.mpie.de:damask/PRIVATE.git $DAMASKROOT/PRIVATE + - git clone git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT + - cd $DAMASKROOT + - git checkout $CI_COMMIT_SHA git@magit1.mpie.de:damask/DAMASK.git + - git clone git@magit1.mpie.de:damask/PRIVATE.git - eval 'source $DAMASKROOT/DAMASK_env.sh' - make -C $DAMASKROOT install @@ -304,15 +308,16 @@ mergeIntoMaster: only: - development script: - - eval 'cd $DAMASKROOT' - - export DEVREV=$(git describe) - - git commit VERSION -m "[skip ci] updated version information after successful test of $DEVREV" + - cd $DAMASKROOT + - export TESTEDREV=$(git describe) # might be detached from development branch + - git commit VERSION -m "[skip ci] updated version information after successful test of $TESTEDREV" + - export UPDATEDREV=$(git describe) # tested state + 1 commit - git checkout master - - git merge development - - git status - - git push origin master + - git merge $UPDATEDREV + - git push origin master # master is now tested version and has updated VERSION file - git checkout development - - git push origin development + - git merge master -s ours # only possible conflict is in VERSION file + - git push origin development # development is unchanged (as master is based on it) but has updated VERSION file ################################################################################################### AbaqusExp: @@ -338,3 +343,11 @@ Spectral: script: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT spectral + +################################################################################################### +removeLock: + stage: clean + before_script: + - echo 'Do nothing' + when: always + script: rm $HOME/GitLabCI.lock From 75a00d53e7fa47029b4709d2a7030ad7ffd1c0aa Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 23:36:04 +0200 Subject: [PATCH 22/49] COMMIT_SHA was not set --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ee1d6884..47c9c0f6d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,6 +85,8 @@ checkout: - mkdir -p $DAMASKROOT - git clone git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT - cd $DAMASKROOT + - export CI_COMMIT_SHA + - echo $CI_COMMIT_SHA - git checkout $CI_COMMIT_SHA git@magit1.mpie.de:damask/DAMASK.git - git clone git@magit1.mpie.de:damask/PRIVATE.git - eval 'source $DAMASKROOT/DAMASK_env.sh' From 5a1f907903331f983f8aa54c49e7f35387f102bd Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 23:38:44 +0200 Subject: [PATCH 23/49] wrong arguments --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47c9c0f6d..963f7f63c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,9 +85,7 @@ checkout: - mkdir -p $DAMASKROOT - git clone git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT - cd $DAMASKROOT - - export CI_COMMIT_SHA - - echo $CI_COMMIT_SHA - - git checkout $CI_COMMIT_SHA git@magit1.mpie.de:damask/DAMASK.git + - git checkout $CI_COMMIT_SHA - git clone git@magit1.mpie.de:damask/PRIVATE.git - eval 'source $DAMASKROOT/DAMASK_env.sh' - make -C $DAMASKROOT install From e7f8e57221ced02ddd1461b8bcbeb1b9d2ac5ddd Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 23:51:02 +0200 Subject: [PATCH 24/49] absolute path not working --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 963f7f63c..2e23f4122 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,6 +87,7 @@ checkout: - cd $DAMASKROOT - git checkout $CI_COMMIT_SHA - git clone git@magit1.mpie.de:damask/PRIVATE.git + - echo $DAMASKROOT - eval 'source $DAMASKROOT/DAMASK_env.sh' - make -C $DAMASKROOT install From 6039c51910004cd88b4ef064f05e9b4f9505c854 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Apr 2017 23:54:42 +0200 Subject: [PATCH 25/49] fixing path --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e23f4122..60554dfcd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,8 +88,8 @@ checkout: - git checkout $CI_COMMIT_SHA - git clone git@magit1.mpie.de:damask/PRIVATE.git - echo $DAMASKROOT - - eval 'source $DAMASKROOT/DAMASK_env.sh' - - make -C $DAMASKROOT install + - eval 'source DAMASK_env.sh' + - make install ################################################################################################### OrientationRelationship: From 50eac331811151166b91e00b9602e9ce0e34a9f0 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 00:00:11 +0200 Subject: [PATCH 26/49] still failing --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 60554dfcd..291b263d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,7 +88,8 @@ checkout: - git checkout $CI_COMMIT_SHA - git clone git@magit1.mpie.de:damask/PRIVATE.git - echo $DAMASKROOT - - eval 'source DAMASK_env.sh' + - ls + - eval 'source ./DAMASK_env.sh' - make install ################################################################################################### From 53ba9f24977aee2c4f593b0c984f3564445cd96a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 00:14:15 +0200 Subject: [PATCH 27/49] still failing --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 291b263d9..a8637bbd9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,8 +88,8 @@ checkout: - git checkout $CI_COMMIT_SHA - git clone git@magit1.mpie.de:damask/PRIVATE.git - echo $DAMASKROOT - - ls - eval 'source ./DAMASK_env.sh' + - echo p $PYTHONPATH - make install ################################################################################################### From 39732f0ad1ad6e4b74c61e383ddbe3d902040c55 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 07:17:57 +0200 Subject: [PATCH 28/49] debugging source --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8637bbd9..81d024645 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,9 +86,9 @@ checkout: - git clone git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT - cd $DAMASKROOT - git checkout $CI_COMMIT_SHA - - git clone git@magit1.mpie.de:damask/PRIVATE.git + #- git clone git@magit1.mpie.de:damask/PRIVATE.git - echo $DAMASKROOT - - eval 'source ./DAMASK_env.sh' + - eval 'source ./DAMASK_env.sh > /tmp/log' - echo p $PYTHONPATH - make install From f759dd0204cf588def0f15d0d556b5b60d54a801 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 07:20:56 +0200 Subject: [PATCH 29/49] debugging source1 --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81d024645..9ab2e87ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,7 +88,9 @@ checkout: - git checkout $CI_COMMIT_SHA #- git clone git@magit1.mpie.de:damask/PRIVATE.git - echo $DAMASKROOT - - eval 'source ./DAMASK_env.sh > /tmp/log' + - echo $PWD + - cat DAMASK_env.sh + - eval 'source $DAMASKROOT/DAMASK_env.sh > /tmp/log' - echo p $PYTHONPATH - make install From 043d96f9027bf9b797f8b10b0e01ff0228748a53 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 07:23:27 +0200 Subject: [PATCH 30/49] debugging source statement --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9ab2e87ef..19e16a5ac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,7 +90,7 @@ checkout: - echo $DAMASKROOT - echo $PWD - cat DAMASK_env.sh - - eval 'source $DAMASKROOT/DAMASK_env.sh > /tmp/log' + - source $DAMASKROOT/DAMASK_env.sh > /tmp/log - echo p $PYTHONPATH - make install From 75c3fff355c498c43e8e06611f244feeb55d2692 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 07:31:57 +0200 Subject: [PATCH 31/49] debugging source statement1 --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19e16a5ac..19f43afce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -89,7 +89,11 @@ checkout: #- git clone git@magit1.mpie.de:damask/PRIVATE.git - echo $DAMASKROOT - echo $PWD + - type source + - type . + - type cd - cat DAMASK_env.sh + - . $DAMASKROOT/DAMASK_env.sh > /tmp/log - source $DAMASKROOT/DAMASK_env.sh > /tmp/log - echo p $PYTHONPATH - make install From 1b71b098d45e39bd7bbd17507a5d15d3a26e71b4 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 07:35:21 +0200 Subject: [PATCH 32/49] debugging source statement2 --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 19f43afce..ce914318f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,6 +93,8 @@ checkout: - type . - type cd - cat DAMASK_env.sh + - echo $SHELL + - echo $0 - . $DAMASKROOT/DAMASK_env.sh > /tmp/log - source $DAMASKROOT/DAMASK_env.sh > /tmp/log - echo p $PYTHONPATH From 4d80f7f8ac1ff21bf651ca0836da053f5c0c04c4 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 07:43:36 +0200 Subject: [PATCH 33/49] working around cd --- .gitlab-ci.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce914318f..f8fa9095f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,16 +83,14 @@ checkout: - echo $CI_PIPELINE_ID > $HOME/GitLabCI.lock script: - mkdir -p $DAMASKROOT - - git clone git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT - - cd $DAMASKROOT - - git checkout $CI_COMMIT_SHA - #- git clone git@magit1.mpie.de:damask/PRIVATE.git + - git clone -b $CI_COMMIT_SHA git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT + #- git clone -q git@magit1.mpie.de:damask/PRIVATE.git - echo $DAMASKROOT - echo $PWD - type source - type . - type cd - - cat DAMASK_env.sh + - cat $DAMASKROOT/DAMASK_env.sh - echo $SHELL - echo $0 - . $DAMASKROOT/DAMASK_env.sh > /tmp/log From 8f08c2e8438fe8178ea277c6fd0c4a70bffd3e1b Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 07:50:53 +0200 Subject: [PATCH 34/49] working around cd2 --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8fa9095f..134bdea21 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,8 @@ checkout: - echo $CI_PIPELINE_ID > $HOME/GitLabCI.lock script: - mkdir -p $DAMASKROOT - - git clone -b $CI_COMMIT_SHA git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT + - git clone git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT + - git checkout $CI_COMMIT_SHA --git-dir=$DAMASKROOT/.git #- git clone -q git@magit1.mpie.de:damask/PRIVATE.git - echo $DAMASKROOT - echo $PWD From 6d82566920b9ff239d5fa7e31d5d44cc90a5ea8f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 07:55:37 +0200 Subject: [PATCH 35/49] working around source statement --- .gitlab-ci.yml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 134bdea21..c25691d46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,18 +84,10 @@ checkout: script: - mkdir -p $DAMASKROOT - git clone git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT - - git checkout $CI_COMMIT_SHA --git-dir=$DAMASKROOT/.git + - cd $DAMASKROOT + - git checkout $CI_COMMIT_SHA #- git clone -q git@magit1.mpie.de:damask/PRIVATE.git - - echo $DAMASKROOT - - echo $PWD - - type source - - type . - - type cd - - cat $DAMASKROOT/DAMASK_env.sh - - echo $SHELL - - echo $0 - - . $DAMASKROOT/DAMASK_env.sh > /tmp/log - - source $DAMASKROOT/DAMASK_env.sh > /tmp/log + - export PYTHONPATH=$PYTHONPATH:$DAMASKROOT/lib - echo p $PYTHONPATH - make install From 92ce58bcf1a24ac56d00dd63a614b010c4b8746d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 08:09:07 +0200 Subject: [PATCH 36/49] trying non-NFS location --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c25691d46..94c78a1d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ stages: ################################################################################################### before_script: - - eval 'source $DAMASKROOT/DAMASK_env.sh' + - source $DAMASKROOT/DAMASK_env.sh - module purge - cd $DAMASKROOT/PRIVATE/testing @@ -34,7 +34,7 @@ variables: #================================================================================================ # Shortcut names #================================================================================================ - DAMASKROOT: "$HOME/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" + DAMASKROOT: "/tmp/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" #================================================================================================ # Names of module files to load From 50b35239276a0365d71912f6e1d37815c613c74d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 08:11:40 +0200 Subject: [PATCH 37/49] reverting --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94c78a1d6..2cef795fd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ stages: ################################################################################################### before_script: - - source $DAMASKROOT/DAMASK_env.sh + - eval 'source $DAMASKROOT/DAMASK_env.sh' - module purge - cd $DAMASKROOT/PRIVATE/testing @@ -87,8 +87,7 @@ checkout: - cd $DAMASKROOT - git checkout $CI_COMMIT_SHA #- git clone -q git@magit1.mpie.de:damask/PRIVATE.git - - export PYTHONPATH=$PYTHONPATH:$DAMASKROOT/lib - - echo p $PYTHONPATH + - eval 'source $DAMASKROOT/DAMASK_env.sh' - make install ################################################################################################### From 11a3d9c3330f6442ab1044a8e9c7ef2dd0797ec0 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 08:15:01 +0200 Subject: [PATCH 38/49] error in DAMASK_env.sh seems to be the reason --- .gitlab-ci.yml | 6 +++--- DAMASK_env.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cef795fd..3409c8dbc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ stages: ################################################################################################### before_script: - - eval 'source $DAMASKROOT/DAMASK_env.sh' + - source $DAMASKROOT/DAMASK_env.sh - module purge - cd $DAMASKROOT/PRIVATE/testing @@ -34,7 +34,7 @@ variables: #================================================================================================ # Shortcut names #================================================================================================ - DAMASKROOT: "/tmp/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" + DAMASKROOT: "$HOME/GitlabCI_Pipeline_$CI_PIPELINE_ID/DAMASK" #================================================================================================ # Names of module files to load @@ -87,7 +87,7 @@ checkout: - cd $DAMASKROOT - git checkout $CI_COMMIT_SHA #- git clone -q git@magit1.mpie.de:damask/PRIVATE.git - - eval 'source $DAMASKROOT/DAMASK_env.sh' + - source $DAMASKROOT/DAMASK_env.sh - make install ################################################################################################### diff --git a/DAMASK_env.sh b/DAMASK_env.sh index fa3171c48..078dd582b 100644 --- a/DAMASK_env.sh +++ b/DAMASK_env.sh @@ -25,11 +25,11 @@ if [[ "x$DAMASK_BIN" != "x" && ! $(echo ":$PATH:" | grep $DAMASK_BIN:) ]]; then export PATH=$DAMASK_BIN:$PATH fi -SOLVER=$(which DAMASK_spectral 2>/dev/null) +SOLVER=$(which DAMASK_spectral || true 2>/dev/null) if [ "x$SOLVER" == "x" ]; then SOLVER='Not found!' fi -PROCESSING=$(which postResults 2>/dev/null) +PROCESSING=$(which postResults || true 2>/dev/null) if [ "x$PROCESSING" == "x" ]; then PROCESSING='Not found!' fi From 97d19320ce1ba11c8e38f18b0a3004f9fbc809c2 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 08:20:30 +0200 Subject: [PATCH 39/49] fixed .zsh script as well, checking out PRIVATE repo again --- .gitlab-ci.yml | 4 ++-- DAMASK_env.zsh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3409c8dbc..bdafe9d72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,10 +83,10 @@ checkout: - echo $CI_PIPELINE_ID > $HOME/GitLabCI.lock script: - mkdir -p $DAMASKROOT - - git clone git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT + - git clone -q git@magit1.mpie.de:damask/DAMASK.git $DAMASKROOT - cd $DAMASKROOT - git checkout $CI_COMMIT_SHA - #- git clone -q git@magit1.mpie.de:damask/PRIVATE.git + - git clone -q git@magit1.mpie.de:damask/PRIVATE.git - source $DAMASKROOT/DAMASK_env.sh - make install diff --git a/DAMASK_env.zsh b/DAMASK_env.zsh index dbb781894..0d043c390 100644 --- a/DAMASK_env.zsh +++ b/DAMASK_env.zsh @@ -19,8 +19,8 @@ if [[ ( "x$DAMASK_BIN" != "x" ) && ( "x$MATCH" = "x" ) ]]; then export PATH=$DAMASK_BIN:$PATH fi -SOLVER=`which DAMASK_spectral 2>/dev/null` -PROCESSING=`which postResults 2>/dev/null` +SOLVER=`which DAMASK_spectral || True 2>/dev/null` +PROCESSING=`which postResults || True 2>/dev/null` if [ "x$DAMASK_NUM_THREADS" = "x" ]; then DAMASK_NUM_THREADS=1 fi From aaa41b8232e95c3b14d3a42ddb4982340f1619c3 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 7 Mar 2017 10:44:39 +0100 Subject: [PATCH 40/49] not needed anymore --- installation/mods_Abaqus/abaqus_v6.env | 2 +- installation/mods_Abaqus/abaqus_v6_serial.env | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installation/mods_Abaqus/abaqus_v6.env b/installation/mods_Abaqus/abaqus_v6.env index d30554d41..0bc5063a1 100644 --- a/installation/mods_Abaqus/abaqus_v6.env +++ b/installation/mods_Abaqus/abaqus_v6.env @@ -31,7 +31,7 @@ fortCmd = "ifort" # -integer-size 32 -DINT=4 assume size of integer to be 4 bytes, matches our definition of pInt compile_fortran = (fortCmd + " -c -fPIC -auto -shared-intel " + - "-I%I -I../lib -free -O1 -fpp -openmp " + + "-I%I -free -O1 -fpp -openmp " + "-ftz -diag-disable 5268 " + "-implicitnone -assume byterecl -stand f08 -standard-semantics " + "-real-size 64 -integer-size 32 -DFLOAT=8 -DINT=4 " + diff --git a/installation/mods_Abaqus/abaqus_v6_serial.env b/installation/mods_Abaqus/abaqus_v6_serial.env index 8cf9778f2..0469dc5f9 100644 --- a/installation/mods_Abaqus/abaqus_v6_serial.env +++ b/installation/mods_Abaqus/abaqus_v6_serial.env @@ -31,7 +31,7 @@ fortCmd = "ifort" # -integer-size 32 -DINT=4 assume size of integer to be 4 bytes, matches our definition of pInt compile_fortran = (fortCmd + " -c -fPIC -auto -shared-intel " + - "-I%I -I../lib -free -O1 -fpp " + + "-I%I -free -O1 -fpp " + "-ftz -diag-disable 5268 " + "-implicitnone -assume byterecl -stand f08 -standard-semantics " + "-real-size 64 -integer-size 32 -DFLOAT=8 -DINT=4 " + From dc387b4060a7919a7a7cb5b1b41213b1f1fc0e29 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 8 Mar 2017 18:00:13 +0100 Subject: [PATCH 41/49] removed unused parameters. Why was shearbanding on in for HMs TWIP steel? --- .../Phase_Dislotwin_TWIP-Steel-FeMnC.config | 2 +- examples/ConfigFiles/Phase_None_Orthorombic.config | 2 +- .../Phase_Phenopowerlaw_BCC-Ferrite.config | 3 --- .../Phase_Phenopowerlaw_BCC-Martensite.config | 3 --- examples/ConfigFiles/Phase_Phenopowerlaw_Gold.config | 11 ----------- .../ConfigFiles/Phase_Phenopowerlaw_multiField.config | 10 ---------- examples/ConfigFiles/Source_Damage_IsoBrittle.config | 2 +- examples/ConfigFiles/Texture_Gauss_001.config | 2 +- examples/ConfigFiles/Texture_Gauss_101.config | 2 +- examples/ConfigFiles/Texture_Gauss_111.config | 2 +- examples/ConfigFiles/Texture_Gauss_123.config | 2 +- .../ConfigFiles/Texture_RandomSingleCrystals.config | 2 +- 12 files changed, 8 insertions(+), 35 deletions(-) diff --git a/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.config b/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.config index 2570b1b95..e7c9d4e19 100644 --- a/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.config +++ b/examples/ConfigFiles/Phase_Dislotwin_TWIP-Steel-FeMnC.config @@ -50,7 +50,7 @@ interactionSlipSlip 0.122 0.122 0.625 0.07 0.137 0.122 # Interaction coefficient ### Shearband parameters ### shearbandresistance 180e6 -shearbandvelocity 1e-4 # set to zero to turn shear banding of +shearbandvelocity 0e-4 # set to zero to turn shear banding of QedgePerSbSystem 3.7e-19 # Activation energy for shear banding [J] p_shearband 1.0 # p-exponent in glide velocity q_shearband 1.0 # q-exponent in glide velocity diff --git a/examples/ConfigFiles/Phase_None_Orthorombic.config b/examples/ConfigFiles/Phase_None_Orthorombic.config index 006b0e048..d7955cf2a 100644 --- a/examples/ConfigFiles/Phase_None_Orthorombic.config +++ b/examples/ConfigFiles/Phase_None_Orthorombic.config @@ -12,4 +12,4 @@ c13 60.41e9 c23 60.41e9 c44 28.34e9 c55 28.34e9 -c66 28.34e9 \ No newline at end of file +c66 28.34e9 diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Ferrite.config b/examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Ferrite.config index 6efd84f65..594c5dc22 100644 --- a/examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Ferrite.config +++ b/examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Ferrite.config @@ -18,8 +18,5 @@ tau0_slip 95.e6 97.e6 # per family, optimization long tausat_slip 222.e6 412.7e6 # per family, optimization long simplex 109 h0_slipslip 1000.0e6 interaction_slipslip 1 1 1.4 1.4 1.4 1.4 -interaction_sliptwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twinslip 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twintwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 w0_slip 2.0 (output) totalshear diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Martensite.config b/examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Martensite.config index 89ae0339b..6e005f251 100644 --- a/examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Martensite.config +++ b/examples/ConfigFiles/Phase_Phenopowerlaw_BCC-Martensite.config @@ -18,8 +18,5 @@ tau0_slip 405.8e6 456.7e6 # per family tausat_slip 872.9e6 971.2e6 # per family h0_slipslip 563.0e9 interaction_slipslip 1 1 1.4 1.4 1.4 1.4 -interaction_sliptwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twinslip 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twintwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 w0_slip 2.0 (output) totalshear diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_Gold.config b/examples/ConfigFiles/Phase_Phenopowerlaw_Gold.config index fdae9c8e7..a2e06fc07 100644 --- a/examples/ConfigFiles/Phase_Phenopowerlaw_Gold.config +++ b/examples/ConfigFiles/Phase_Phenopowerlaw_Gold.config @@ -35,18 +35,7 @@ tausat_slip 53.00e6 # per family a_slip 1.0 gdot0_twin 0.001 n_twin 20 -tau0_twin 0 # per family -s_pr 0 # push-up factor for slip saturation due to twinning -twin_b 0 -twin_c 0 -twin_d 0 -twin_e 0 h0_slipslip 75e6 -h0_twinslip 0 -h0_twintwin 0 interaction_slipslip 1 1 1.4 1.4 1.4 1.4 -interaction_sliptwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twinslip 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twintwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 atol_resistance 1 diff --git a/examples/ConfigFiles/Phase_Phenopowerlaw_multiField.config b/examples/ConfigFiles/Phase_Phenopowerlaw_multiField.config index 4436564cc..05503a6e7 100644 --- a/examples/ConfigFiles/Phase_Phenopowerlaw_multiField.config +++ b/examples/ConfigFiles/Phase_Phenopowerlaw_multiField.config @@ -29,18 +29,8 @@ a_slip 2.25 gdot0_twin 0.001 n_twin 20 tau0_twin 31e6 # per family -s_pr 0 # push-up factor for slip saturation due to twinning -twin_b 0 -twin_c 0 -twin_d 0 -twin_e 0 h0_slipslip 75e6 -h0_twinslip 0 -h0_twintwin 0 interaction_slipslip 1 1 1.4 1.4 1.4 1.4 -interaction_sliptwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twinslip 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twintwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 atol_resistance 1 (stiffness_degradation) damage diff --git a/examples/ConfigFiles/Source_Damage_IsoBrittle.config b/examples/ConfigFiles/Source_Damage_IsoBrittle.config index b248bb8fc..b36165ab4 100644 --- a/examples/ConfigFiles/Source_Damage_IsoBrittle.config +++ b/examples/ConfigFiles/Source_Damage_IsoBrittle.config @@ -2,4 +2,4 @@ isobrittle_criticalStrainEnergy 1400000.0 isobrittle_atol 0.01 isobrittle_N 1.0 -(output) isoBrittle_DrivingForce \ No newline at end of file +(output) isoBrittle_DrivingForce diff --git a/examples/ConfigFiles/Texture_Gauss_001.config b/examples/ConfigFiles/Texture_Gauss_001.config index 153fab381..4711c4135 100644 --- a/examples/ConfigFiles/Texture_Gauss_001.config +++ b/examples/ConfigFiles/Texture_Gauss_001.config @@ -1,2 +1,2 @@ [001] -(gauss) phi1 0.000 Phi 0.000 phi2 0.000 scatter 0.000 fraction 1.000 \ No newline at end of file +(gauss) phi1 0.000 Phi 0.000 phi2 0.000 scatter 0.000 fraction 1.000 diff --git a/examples/ConfigFiles/Texture_Gauss_101.config b/examples/ConfigFiles/Texture_Gauss_101.config index 28351eece..79457aeac 100644 --- a/examples/ConfigFiles/Texture_Gauss_101.config +++ b/examples/ConfigFiles/Texture_Gauss_101.config @@ -1,2 +1,2 @@ [101] -(gauss) phi1 0.000 Phi 45.000 phi2 90.000 scatter 0.000 fraction 1.000 \ No newline at end of file +(gauss) phi1 0.000 Phi 45.000 phi2 90.000 scatter 0.000 fraction 1.000 diff --git a/examples/ConfigFiles/Texture_Gauss_111.config b/examples/ConfigFiles/Texture_Gauss_111.config index e4dc139f8..8204bfb69 100644 --- a/examples/ConfigFiles/Texture_Gauss_111.config +++ b/examples/ConfigFiles/Texture_Gauss_111.config @@ -1,2 +1,2 @@ [111] -(gauss) phi1 0.000 Phi 54.7356 phi2 45.000 scatter 0.000 fraction 1.000 \ No newline at end of file +(gauss) phi1 0.000 Phi 54.7356 phi2 45.000 scatter 0.000 fraction 1.000 diff --git a/examples/ConfigFiles/Texture_Gauss_123.config b/examples/ConfigFiles/Texture_Gauss_123.config index 374674e09..32d28442f 100644 --- a/examples/ConfigFiles/Texture_Gauss_123.config +++ b/examples/ConfigFiles/Texture_Gauss_123.config @@ -1,2 +1,2 @@ [123] -(gauss) phi1 209.805 Phi 29.206 phi2 63.435 scatter 0.000 fraction 1.000 \ No newline at end of file +(gauss) phi1 209.805 Phi 29.206 phi2 63.435 scatter 0.000 fraction 1.000 diff --git a/examples/ConfigFiles/Texture_RandomSingleCrystals.config b/examples/ConfigFiles/Texture_RandomSingleCrystals.config index fac65ae20..6e1f98a3d 100644 --- a/examples/ConfigFiles/Texture_RandomSingleCrystals.config +++ b/examples/ConfigFiles/Texture_RandomSingleCrystals.config @@ -1,2 +1,2 @@ [RandomSingleCrystals] -(random) scatter 0.000 fraction 1.000 \ No newline at end of file +(random) scatter 0.000 fraction 1.000 From 95a982e00207d5b006f8ca411d36d5d38f654c10 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 8 Mar 2017 18:46:53 +0100 Subject: [PATCH 42/49] default type for muliple arguments (not extend) is tuple, not list --- processing/pre/geom_addPrimitive.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/processing/pre/geom_addPrimitive.py b/processing/pre/geom_addPrimitive.py index 51dc1db3c..607e5facd 100755 --- a/processing/pre/geom_addPrimitive.py +++ b/processing/pre/geom_addPrimitive.py @@ -51,23 +51,22 @@ parser.add_option( '--nonperiodic', dest='periodic', action='store_false', parser.add_option( '--voxelspace', dest='voxelspace', action='store_true', help = '-c and -d are given in (0 to grid) coordinates instead of (origin to origin+size) \ coordinates [%default]') -parser.set_defaults(center = [0,0,0], +parser.set_defaults(center = (.0,.0,.0), fill = 0, - quaternion = [], - angleaxis = [], degrees = False, - exponent = [1e10,1e10,1e10], # box shape by default + exponent = (1e10,1e10,1e10), # box shape by default periodic = True, voxelspace = False ) (options, filenames) = parser.parse_args() - -if options.angleaxis != []: +if options.dimension is None: + parser.error('no dimension specified.') +if options.angleaxis is not None: options.angleaxis = map(float,options.angleaxis) rotation = damask.Quaternion().fromAngleAxis(np.radians(options.angleaxis[0]) if options.degrees else options.angleaxis[0], options.angleaxis[1:4]) -elif options.quaternion != []: +elif options.quaternion is not None: options.quaternion = map(float,options.quaternion) rotation = damask.Quaternion(options.quaternion) else: @@ -125,7 +124,7 @@ for name in filenames: # coordinates given in real space (default) vs voxel space if not options.voxelspace: - options.center += info['origin'] + options.center += info['origin'] options.center *= np.array(info['grid']) / np.array(info['size']) options.dimension *= np.array(info['grid']) / np.array(info['size']) From 101913a944cbd6bc7984842665283dc5d6efcc9d Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 8 Mar 2017 19:12:05 +0100 Subject: [PATCH 43/49] rel tol of 0.0 useful when looking for absolute value only --- code/numerics.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/numerics.f90 b/code/numerics.f90 index 6569d7cb4..4358624de 100644 --- a/code/numerics.f90 +++ b/code/numerics.f90 @@ -694,9 +694,9 @@ subroutine numerics_init .not. memory_efficient) call IO_error(error_ID = 847_pInt) if (err_stress_tolrel <= 0.0_pReal) call IO_error(301_pInt,ext_msg='err_stress_tolRel') if (err_stress_tolabs <= 0.0_pReal) call IO_error(301_pInt,ext_msg='err_stress_tolAbs') - if (err_div_tolRel <= 0.0_pReal) call IO_error(301_pInt,ext_msg='err_div_tolRel') + if (err_div_tolRel < 0.0_pReal) call IO_error(301_pInt,ext_msg='err_div_tolRel') if (err_div_tolAbs <= 0.0_pReal) call IO_error(301_pInt,ext_msg='err_div_tolAbs') - if (err_curl_tolRel <= 0.0_pReal) call IO_error(301_pInt,ext_msg='err_curl_tolRel') + if (err_curl_tolRel < 0.0_pReal) call IO_error(301_pInt,ext_msg='err_curl_tolRel') if (err_curl_tolAbs <= 0.0_pReal) call IO_error(301_pInt,ext_msg='err_curl_tolAbs') if (polarAlpha <= 0.0_pReal .or. & polarAlpha > 2.0_pReal) call IO_error(301_pInt,ext_msg='polarAlpha') From bdbbcdb908b66da140e0438dc8a321af63bda88c Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 13:02:55 +0200 Subject: [PATCH 44/49] parameters not needed --- examples/SpectralMethod/material.config | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/examples/SpectralMethod/material.config b/examples/SpectralMethod/material.config index 14437c5d8..978e0f511 100644 --- a/examples/SpectralMethod/material.config +++ b/examples/SpectralMethod/material.config @@ -52,22 +52,8 @@ n_slip 20 tau0_slip 31e6 # per family tausat_slip 63e6 # per family a_slip 2.25 -gdot0_twin 0.001 -n_twin 20 -tau0_twin 31e6 # per family -s_pr 0 # push-up factor for slip saturation due to twinning -twin_b 0 -twin_c 0 -twin_d 0 -twin_e 0 h0_slipslip 75e6 -h0_sliptwin 0 -h0_twinslip 0 -h0_twintwin 0 interaction_slipslip 1 1 1.4 1.4 1.4 1.4 -interaction_sliptwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twinslip 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 -interaction_twintwin 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 atol_resistance 1 From f1c6524c34a4c052e1e690a4483b2504a49d416f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 13:07:38 +0200 Subject: [PATCH 45/49] debugging update procedure --- .gitlab-ci.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdafe9d72..7cda5b9e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,19 @@ stages: - prepareAll - - preprocessing - - postprocessing - - compileSpectralIntel - - compileSpectralGNU - - prepareSpectral - - spectral - - compileMarc2014 - - compileMarc2014.2 - - compileMarc2015 - - compileMarc2016 - - marc - - compileAbaqus2016 - - compileAbaqus2017 - - example + #- preprocessing + #- postprocessing + #- compileSpectralIntel + #- compileSpectralGNU + #- prepareSpectral + #- spectral + #- compileMarc2014 + #- compileMarc2014.2 + #- compileMarc2015 + #- compileMarc2016 + #- marc + #- compileAbaqus2016 + #- compileAbaqus2017 + #- example - updateMaster - createDocumentation - clean @@ -310,6 +310,7 @@ mergeIntoMaster: script: - cd $DAMASKROOT - export TESTEDREV=$(git describe) # might be detached from development branch + - echo $TESTEDREV > VERSION - git commit VERSION -m "[skip ci] updated version information after successful test of $TESTEDREV" - export UPDATEDREV=$(git describe) # tested state + 1 commit - git checkout master From bf7b4f2af52d1b02425e66d18a5b144842af7c9c Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 13:21:38 +0200 Subject: [PATCH 46/49] debugging update procedure2 --- .gitlab-ci.yml | 424 ++++++++++++++++++++++++------------------------- 1 file changed, 212 insertions(+), 212 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7cda5b9e9..ad8f5d13a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,218 +90,218 @@ checkout: - source $DAMASKROOT/DAMASK_env.sh - make install -################################################################################################### -OrientationRelationship: - stage: preprocessing - script: OrientationRelationship/test.py - -Pre_SeedGeneration: - stage: preprocessing - script: PreProcessing_SeedGeneration/test.py - -Pre_GeomGeneration: - stage: preprocessing - script: PreProcessing_GeomGeneration/test.py - -Pre_GeomModification: - stage: preprocessing - script: PreProcessing_GeomModification/test.py - -Pre_General: - stage: preprocessing - script: PreProcessing/test.py - -Spectral_geometryPacking: - stage: preprocessing - script: Spectral_geometryPacking/test.py - -################################################################################################### -Post_General: - stage: postprocessing - script: PostProcessing/test.py - -Post_GeometryReconstruction: - stage: postprocessing - script: Spectral_geometryReconstruction/test.py - -Post_addCurl: - stage: postprocessing - script: addCurl/test.py - -Post_addDivergence: - stage: postprocessing - script: addDivergence/test.py - -Post_addGradient: - stage: postprocessing - script: addGradient/test.py - -Post_ParaviewRelated: - stage: postprocessing - script: ParaviewRelated/test.py - -################################################################################################### -Compile_Intel: - stage: compileSpectralIntel - script: - - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - - SpectralAll_compileIfort/test.py - -################################################################################################### -Compile_GNU: - stage: compileSpectralGNU - script: - - module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU - - SpectralAll_compileGfortran/test.py - -################################################################################################### -Compile_Intel_Prepare: - stage: prepareSpectral - script: - - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - - make -C $DAMASKROOT clean spectral install tidy - -################################################################################################### -Spectral_PackedGeometry: - stage: spectral - script: Spectral_PackedGeometry/test.py - -Spectral_parsingArguments: - stage: spectral - script: Spectral_parsingArguments/test.py - -StateIntegration_compareVariants: - stage: spectral - script: StateIntegration_compareVariants/test.py - -nonlocal_densityConservation: - stage: spectral - script: nonlocal_densityConservation/test.py - -Spectral_ipNeighborhood: - stage: spectral - script: Spectral_ipNeighborhood/test.py - -Nonlocal_Damage_DetectChanges: - stage: spectral - script: Nonlocal_Damage_DetectChanges/test.py - -SpectralAll_restart: - stage: spectral - script: SpectralAll_restart/test.py - -SpectralAll_parsingLoadCase: - stage: spectral - script: SpectralAll_parsingLoadCase/test.py - -SpectralBasic_loadCaseRotation: - stage: spectral - script: SpectralBasic_loadCaseRotation/test.py - -Spectral_MPI: - stage: spectral - script: - - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - - Spectral_MPI/test.py - -Plasticity_DetectChanges: - stage: spectral - script: Plasticity_DetectChanges/test.py - -Homogenization: - stage: spectral - script: Homogenization/test.py - -Phenopowerlaw_singleSlip: - stage: spectral - script: Phenopowerlaw_singleSlip/test.py - -HybridIA: - stage: spectral - script: HybridIA/test.py - -################################################################################################### -Marc_compileIfort2014: - stage: compileMarc2014 - script: - - module load $IntelCompiler16_0 $MSC2014 - - Marc_compileIfort/test.py -m 2014 - -################################################################################################### -Marc_compileIfort2014.2: - stage: compileMarc2014.2 - script: - - module load $IntelCompiler16_0 $MSC2014_2 - - Marc_compileIfort/test.py -m 2014.2 - -################################################################################################### -Marc_compileIfort2015: - stage: compileMarc2015 - script: - - module load $IntelCompiler16_0 $MSC2015 - - Marc_compileIfort/test.py -m 2015 - -################################################################################################### -Marc_compileIfort2016: - stage: compileMarc2016 - script: - - module load $IntelCompiler16_0 $MSC2016 - - Marc_compileIfort/test.py -m 2016 - -################################################################################################### -Hex_elastic: - stage: marc - script: - - module load $IntelCompiler16_0 $MSC - - Hex_elastic/test.py - -CubicFCC_elastic: - stage: marc - script: - - module load $IntelCompiler16_0 $MSC - - CubicFCC_elastic/test.py - -CubicBCC_elastic: - stage: marc - script: - - module load $IntelCompiler16_0 $MSC - - CubicBCC_elastic/test.py - -J2_plasticBehavior: - stage: marc - script: - - module load $IntelCompiler16_0 $MSC - - J2_plasticBehavior/test.py - -################################################################################################### -Abaqus_compile2016: - stage: compileAbaqus2016 - script: - - module load $IntelCompiler16_0 $Abaqus2016 - - Abaqus_compileIfort/test.py -a 2016 - -################################################################################################### -Abaqus_compile2017: - stage: compileAbaqus2017 - script: - - module load $IntelCompiler16_0 $Abaqus2017 - - Abaqus_compileIfort/test.py -a 2017 - -################################################################################################### -SpectralExample: - stage: example - only: - - development - script: SpectralAll_example/test.py - -AbaqusExample: - stage: example - only: - - development - script: - - module load $IntelCompiler16_0 $Abaqus - - Abaqus_example/test.py - +#################################################################################################### +#OrientationRelationship: +# stage: preprocessing +# script: OrientationRelationship/test.py +# +#Pre_SeedGeneration: +# stage: preprocessing +# script: PreProcessing_SeedGeneration/test.py +# +#Pre_GeomGeneration: +# stage: preprocessing +# script: PreProcessing_GeomGeneration/test.py +# +#Pre_GeomModification: +# stage: preprocessing +# script: PreProcessing_GeomModification/test.py +# +#Pre_General: +# stage: preprocessing +# script: PreProcessing/test.py +# +#Spectral_geometryPacking: +# stage: preprocessing +# script: Spectral_geometryPacking/test.py +# +#################################################################################################### +#Post_General: +# stage: postprocessing +# script: PostProcessing/test.py +# +#Post_GeometryReconstruction: +# stage: postprocessing +# script: Spectral_geometryReconstruction/test.py +# +#Post_addCurl: +# stage: postprocessing +# script: addCurl/test.py +# +#Post_addDivergence: +# stage: postprocessing +# script: addDivergence/test.py +# +#Post_addGradient: +# stage: postprocessing +# script: addGradient/test.py +# +#Post_ParaviewRelated: +# stage: postprocessing +# script: ParaviewRelated/test.py +# +#################################################################################################### +#Compile_Intel: +# stage: compileSpectralIntel +# script: +# - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel +# - SpectralAll_compileIfort/test.py +# +#################################################################################################### +#Compile_GNU: +# stage: compileSpectralGNU +# script: +# - module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU +# - SpectralAll_compileGfortran/test.py +# +#################################################################################################### +#Compile_Intel_Prepare: +# stage: prepareSpectral +# script: +# - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel +# - make -C $DAMASKROOT clean spectral install tidy +# +#################################################################################################### +#Spectral_PackedGeometry: +# stage: spectral +# script: Spectral_PackedGeometry/test.py +# +#Spectral_parsingArguments: +# stage: spectral +# script: Spectral_parsingArguments/test.py +# +#StateIntegration_compareVariants: +# stage: spectral +# script: StateIntegration_compareVariants/test.py +# +#nonlocal_densityConservation: +# stage: spectral +# script: nonlocal_densityConservation/test.py +# +#Spectral_ipNeighborhood: +# stage: spectral +# script: Spectral_ipNeighborhood/test.py +# +#Nonlocal_Damage_DetectChanges: +# stage: spectral +# script: Nonlocal_Damage_DetectChanges/test.py +# +#SpectralAll_restart: +# stage: spectral +# script: SpectralAll_restart/test.py +# +#SpectralAll_parsingLoadCase: +# stage: spectral +# script: SpectralAll_parsingLoadCase/test.py +# +#SpectralBasic_loadCaseRotation: +# stage: spectral +# script: SpectralBasic_loadCaseRotation/test.py +# +#Spectral_MPI: +# stage: spectral +# script: +# - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel +# - Spectral_MPI/test.py +# +#Plasticity_DetectChanges: +# stage: spectral +# script: Plasticity_DetectChanges/test.py +# +#Homogenization: +# stage: spectral +# script: Homogenization/test.py +# +#Phenopowerlaw_singleSlip: +# stage: spectral +# script: Phenopowerlaw_singleSlip/test.py +# +#HybridIA: +# stage: spectral +# script: HybridIA/test.py +# +#################################################################################################### +#Marc_compileIfort2014: +# stage: compileMarc2014 +# script: +# - module load $IntelCompiler16_0 $MSC2014 +# - Marc_compileIfort/test.py -m 2014 +# +#################################################################################################### +#Marc_compileIfort2014.2: +# stage: compileMarc2014.2 +# script: +# - module load $IntelCompiler16_0 $MSC2014_2 +# - Marc_compileIfort/test.py -m 2014.2 +# +#################################################################################################### +#Marc_compileIfort2015: +# stage: compileMarc2015 +# script: +# - module load $IntelCompiler16_0 $MSC2015 +# - Marc_compileIfort/test.py -m 2015 +# +#################################################################################################### +#Marc_compileIfort2016: +# stage: compileMarc2016 +# script: +# - module load $IntelCompiler16_0 $MSC2016 +# - Marc_compileIfort/test.py -m 2016 +# +#################################################################################################### +#Hex_elastic: +# stage: marc +# script: +# - module load $IntelCompiler16_0 $MSC +# - Hex_elastic/test.py +# +#CubicFCC_elastic: +# stage: marc +# script: +# - module load $IntelCompiler16_0 $MSC +# - CubicFCC_elastic/test.py +# +#CubicBCC_elastic: +# stage: marc +# script: +# - module load $IntelCompiler16_0 $MSC +# - CubicBCC_elastic/test.py +# +#J2_plasticBehavior: +# stage: marc +# script: +# - module load $IntelCompiler16_0 $MSC +# - J2_plasticBehavior/test.py +# +#################################################################################################### +#Abaqus_compile2016: +# stage: compileAbaqus2016 +# script: +# - module load $IntelCompiler16_0 $Abaqus2016 +# - Abaqus_compileIfort/test.py -a 2016 +# +#################################################################################################### +#Abaqus_compile2017: +# stage: compileAbaqus2017 +# script: +# - module load $IntelCompiler16_0 $Abaqus2017 +# - Abaqus_compileIfort/test.py -a 2017 +# +#################################################################################################### +#SpectralExample: +# stage: example +# only: +# - development +# script: SpectralAll_example/test.py +# +#AbaqusExample: +# stage: example +# only: +# - development +# script: +# - module load $IntelCompiler16_0 $Abaqus +# - Abaqus_example/test.py +# ################################################################################################### mergeIntoMaster: stage: updateMaster From 73ce3c01b72d510e20b8a7107be4f80014eac15f Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 13 Apr 2017 13:23:07 +0200 Subject: [PATCH 47/49] [skip ci] updated version information after successful test of v2.0.1-447-gbf7b4f2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1d89fa753..82fb0985b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-414-g81d0752 +v2.0.1-447-gbf7b4f2 From d595ad56166a1f0d2ba190cf28c8c434facaedd9 Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 13 Apr 2017 13:27:39 +0200 Subject: [PATCH 48/49] [skip ci] updated version information after successful test of v2.0.1-449-g3898995 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1d89fa753..e84d8672e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.1-414-g81d0752 +v2.0.1-449-g3898995 From e5eea4caec9fe3a95abb67b25ba782b387920e17 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 16:06:35 +0200 Subject: [PATCH 49/49] finished debugging, master and release will never be tested --- .gitlab-ci.yml | 591 ++++++++++++++++++++++++++++++------------------- 1 file changed, 363 insertions(+), 228 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad8f5d13a..bc8af4d11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,19 +1,19 @@ stages: - prepareAll - #- preprocessing - #- postprocessing - #- compileSpectralIntel - #- compileSpectralGNU - #- prepareSpectral - #- spectral - #- compileMarc2014 - #- compileMarc2014.2 - #- compileMarc2015 - #- compileMarc2016 - #- marc - #- compileAbaqus2016 - #- compileAbaqus2017 - #- example + - preprocessing + - postprocessing + - compileSpectralIntel + - compileSpectralGNU + - prepareSpectral + - spectral + - compileMarc2014 + - compileMarc2014.2 + - compileMarc2015 + - compileMarc2016 + - marc + - compileAbaqus2016 + - compileAbaqus2017 + - example - updateMaster - createDocumentation - clean @@ -89,224 +89,342 @@ checkout: - git clone -q git@magit1.mpie.de:damask/PRIVATE.git - source $DAMASKROOT/DAMASK_env.sh - make install + except: + - master + - release -#################################################################################################### -#OrientationRelationship: -# stage: preprocessing -# script: OrientationRelationship/test.py -# -#Pre_SeedGeneration: -# stage: preprocessing -# script: PreProcessing_SeedGeneration/test.py -# -#Pre_GeomGeneration: -# stage: preprocessing -# script: PreProcessing_GeomGeneration/test.py -# -#Pre_GeomModification: -# stage: preprocessing -# script: PreProcessing_GeomModification/test.py -# -#Pre_General: -# stage: preprocessing -# script: PreProcessing/test.py -# -#Spectral_geometryPacking: -# stage: preprocessing -# script: Spectral_geometryPacking/test.py -# -#################################################################################################### -#Post_General: -# stage: postprocessing -# script: PostProcessing/test.py -# -#Post_GeometryReconstruction: -# stage: postprocessing -# script: Spectral_geometryReconstruction/test.py -# -#Post_addCurl: -# stage: postprocessing -# script: addCurl/test.py -# -#Post_addDivergence: -# stage: postprocessing -# script: addDivergence/test.py -# -#Post_addGradient: -# stage: postprocessing -# script: addGradient/test.py -# -#Post_ParaviewRelated: -# stage: postprocessing -# script: ParaviewRelated/test.py -# -#################################################################################################### -#Compile_Intel: -# stage: compileSpectralIntel -# script: -# - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel -# - SpectralAll_compileIfort/test.py -# -#################################################################################################### -#Compile_GNU: -# stage: compileSpectralGNU -# script: -# - module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU -# - SpectralAll_compileGfortran/test.py -# -#################################################################################################### -#Compile_Intel_Prepare: -# stage: prepareSpectral -# script: -# - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel -# - make -C $DAMASKROOT clean spectral install tidy -# -#################################################################################################### -#Spectral_PackedGeometry: -# stage: spectral -# script: Spectral_PackedGeometry/test.py -# -#Spectral_parsingArguments: -# stage: spectral -# script: Spectral_parsingArguments/test.py -# -#StateIntegration_compareVariants: -# stage: spectral -# script: StateIntegration_compareVariants/test.py -# -#nonlocal_densityConservation: -# stage: spectral -# script: nonlocal_densityConservation/test.py -# -#Spectral_ipNeighborhood: -# stage: spectral -# script: Spectral_ipNeighborhood/test.py -# -#Nonlocal_Damage_DetectChanges: -# stage: spectral -# script: Nonlocal_Damage_DetectChanges/test.py -# -#SpectralAll_restart: -# stage: spectral -# script: SpectralAll_restart/test.py -# -#SpectralAll_parsingLoadCase: -# stage: spectral -# script: SpectralAll_parsingLoadCase/test.py -# -#SpectralBasic_loadCaseRotation: -# stage: spectral -# script: SpectralBasic_loadCaseRotation/test.py -# -#Spectral_MPI: -# stage: spectral -# script: -# - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel -# - Spectral_MPI/test.py -# -#Plasticity_DetectChanges: -# stage: spectral -# script: Plasticity_DetectChanges/test.py -# -#Homogenization: -# stage: spectral -# script: Homogenization/test.py -# -#Phenopowerlaw_singleSlip: -# stage: spectral -# script: Phenopowerlaw_singleSlip/test.py -# -#HybridIA: -# stage: spectral -# script: HybridIA/test.py -# -#################################################################################################### -#Marc_compileIfort2014: -# stage: compileMarc2014 -# script: -# - module load $IntelCompiler16_0 $MSC2014 -# - Marc_compileIfort/test.py -m 2014 -# -#################################################################################################### -#Marc_compileIfort2014.2: -# stage: compileMarc2014.2 -# script: -# - module load $IntelCompiler16_0 $MSC2014_2 -# - Marc_compileIfort/test.py -m 2014.2 -# -#################################################################################################### -#Marc_compileIfort2015: -# stage: compileMarc2015 -# script: -# - module load $IntelCompiler16_0 $MSC2015 -# - Marc_compileIfort/test.py -m 2015 -# -#################################################################################################### -#Marc_compileIfort2016: -# stage: compileMarc2016 -# script: -# - module load $IntelCompiler16_0 $MSC2016 -# - Marc_compileIfort/test.py -m 2016 -# -#################################################################################################### -#Hex_elastic: -# stage: marc -# script: -# - module load $IntelCompiler16_0 $MSC -# - Hex_elastic/test.py -# -#CubicFCC_elastic: -# stage: marc -# script: -# - module load $IntelCompiler16_0 $MSC -# - CubicFCC_elastic/test.py -# -#CubicBCC_elastic: -# stage: marc -# script: -# - module load $IntelCompiler16_0 $MSC -# - CubicBCC_elastic/test.py -# -#J2_plasticBehavior: -# stage: marc -# script: -# - module load $IntelCompiler16_0 $MSC -# - J2_plasticBehavior/test.py -# -#################################################################################################### -#Abaqus_compile2016: -# stage: compileAbaqus2016 -# script: -# - module load $IntelCompiler16_0 $Abaqus2016 -# - Abaqus_compileIfort/test.py -a 2016 -# -#################################################################################################### -#Abaqus_compile2017: -# stage: compileAbaqus2017 -# script: -# - module load $IntelCompiler16_0 $Abaqus2017 -# - Abaqus_compileIfort/test.py -a 2017 -# -#################################################################################################### -#SpectralExample: -# stage: example -# only: -# - development -# script: SpectralAll_example/test.py -# -#AbaqusExample: -# stage: example -# only: -# - development -# script: -# - module load $IntelCompiler16_0 $Abaqus -# - Abaqus_example/test.py -# ################################################################################################### -mergeIntoMaster: - stage: updateMaster +OrientationRelationship: + stage: preprocessing + script: OrientationRelationship/test.py + except: + - master + - release + +Pre_SeedGeneration: + stage: preprocessing + script: PreProcessing_SeedGeneration/test.py + except: + - master + - release + +Pre_GeomGeneration: + stage: preprocessing + script: PreProcessing_GeomGeneration/test.py + except: + - master + - release + +Pre_GeomModification: + stage: preprocessing + script: PreProcessing_GeomModification/test.py + except: + - master + - release + +Pre_General: + stage: preprocessing + script: PreProcessing/test.py + except: + - master + - release + +Spectral_geometryPacking: + stage: preprocessing + script: Spectral_geometryPacking/test.py + except: + - master + - release + +################################################################################################### +Post_General: + stage: postprocessing + script: PostProcessing/test.py + except: + - master + - release + +Post_GeometryReconstruction: + stage: postprocessing + script: Spectral_geometryReconstruction/test.py + except: + - master + - release + +Post_addCurl: + stage: postprocessing + script: addCurl/test.py + except: + - master + - release + +Post_addDivergence: + stage: postprocessing + script: addDivergence/test.py + except: + - master + - release + +Post_addGradient: + stage: postprocessing + script: addGradient/test.py + except: + - master + - release + +Post_ParaviewRelated: + stage: postprocessing + script: ParaviewRelated/test.py + except: + - master + - release + +################################################################################################### +Compile_Intel: + stage: compileSpectralIntel + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel + - SpectralAll_compileIfort/test.py + except: + - master + - release + +################################################################################################### +Compile_GNU: + stage: compileSpectralGNU + script: + - module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU + - SpectralAll_compileGfortran/test.py + except: + - master + - release + +################################################################################################### +Compile_Intel_Prepare: + stage: prepareSpectral + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel + - make -C $DAMASKROOT clean spectral install tidy + except: + - master + - release + +################################################################################################### +Spectral_PackedGeometry: + stage: spectral + script: Spectral_PackedGeometry/test.py + except: + - master + - release + +Spectral_parsingArguments: + stage: spectral + script: Spectral_parsingArguments/test.py + except: + - master + - release + +StateIntegration_compareVariants: + stage: spectral + script: StateIntegration_compareVariants/test.py + except: + - master + - release + +nonlocal_densityConservation: + stage: spectral + script: nonlocal_densityConservation/test.py + except: + - master + - release + +Spectral_ipNeighborhood: + stage: spectral + script: Spectral_ipNeighborhood/test.py + except: + - master + - release + +Nonlocal_Damage_DetectChanges: + stage: spectral + script: Nonlocal_Damage_DetectChanges/test.py + except: + - master + - release + +SpectralAll_restart: + stage: spectral + script: SpectralAll_restart/test.py + except: + - master + - release + +SpectralAll_parsingLoadCase: + stage: spectral + script: SpectralAll_parsingLoadCase/test.py + except: + - master + - release + +SpectralBasic_loadCaseRotation: + stage: spectral + script: SpectralBasic_loadCaseRotation/test.py + except: + - master + - release + +Spectral_MPI: + stage: spectral + script: + - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel + - Spectral_MPI/test.py + except: + - master + - release + +Plasticity_DetectChanges: + stage: spectral + script: Plasticity_DetectChanges/test.py + except: + - master + - release + +Homogenization: + stage: spectral + script: Homogenization/test.py + except: + - master + - release + +Phenopowerlaw_singleSlip: + stage: spectral + script: Phenopowerlaw_singleSlip/test.py + except: + - master + - release + +HybridIA: + stage: spectral + script: HybridIA/test.py + except: + - master + - release + +################################################################################################### +Marc_compileIfort2014: + stage: compileMarc2014 + script: + - module load $IntelCompiler16_0 $MSC2014 + - Marc_compileIfort/test.py -m 2014 + except: + - master + - release + +################################################################################################### +Marc_compileIfort2014.2: + stage: compileMarc2014.2 + script: + - module load $IntelCompiler16_0 $MSC2014_2 + - Marc_compileIfort/test.py -m 2014.2 + except: + - master + - release + +################################################################################################### +Marc_compileIfort2015: + stage: compileMarc2015 + script: + - module load $IntelCompiler16_0 $MSC2015 + - Marc_compileIfort/test.py -m 2015 + except: + - master + - release + +################################################################################################### +Marc_compileIfort2016: + stage: compileMarc2016 + script: + - module load $IntelCompiler16_0 $MSC2016 + - Marc_compileIfort/test.py -m 2016 + except: + - master + - release + +################################################################################################### +Hex_elastic: + stage: marc + script: + - module load $IntelCompiler16_0 $MSC + - Hex_elastic/test.py + except: + - master + - release + +CubicFCC_elastic: + stage: marc + script: + - module load $IntelCompiler16_0 $MSC + - CubicFCC_elastic/test.py + except: + - master + - release + +CubicBCC_elastic: + stage: marc + script: + - module load $IntelCompiler16_0 $MSC + - CubicBCC_elastic/test.py + except: + - master + - release + +J2_plasticBehavior: + stage: marc + script: + - module load $IntelCompiler16_0 $MSC + - J2_plasticBehavior/test.py + except: + - master + - release + +################################################################################################### +Abaqus_compile2016: + stage: compileAbaqus2016 + script: + - module load $IntelCompiler16_0 $Abaqus2016 + - Abaqus_compileIfort/test.py -a 2016 + except: + - master + - release + +################################################################################################### +Abaqus_compile2017: + stage: compileAbaqus2017 + script: + - module load $IntelCompiler16_0 $Abaqus2017 + - Abaqus_compileIfort/test.py -a 2017 + except: + - master + - release + +################################################################################################### +SpectralExample: + stage: example + script: SpectralAll_example/test.py only: - development + +AbaqusExample: + stage: example + script: + - module load $IntelCompiler16_0 $Abaqus + - Abaqus_example/test.py + only: + - development + +################################################################################################## +mergeIntoMaster: + stage: updateMaster script: - cd $DAMASKROOT - export TESTEDREV=$(git describe) # might be detached from development branch @@ -319,6 +437,8 @@ mergeIntoMaster: - git checkout development - git merge master -s ours # only possible conflict is in VERSION file - git push origin development # development is unchanged (as master is based on it) but has updated VERSION file + only: + - development ################################################################################################### AbaqusExp: @@ -326,24 +446,36 @@ AbaqusExp: script: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT abaqus_exp + except: + - master + - release AbaqusStd: stage: createDocumentation script: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT abaqus_std + except: + - master + - release Marc: stage: createDocumentation script: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT marc + except: + - master + - release Spectral: stage: createDocumentation script: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel $Doxygen - $DAMASKROOT/PRIVATE/documenting/runDoxygen.sh $DAMASKROOT spectral + except: + - master + - release ################################################################################################### removeLock: @@ -352,3 +484,6 @@ removeLock: - echo 'Do nothing' when: always script: rm $HOME/GitLabCI.lock + except: + - master + - release