Merge branch 'development' into 19-NewStyleDislotwin

.gitlab-ci.yml

@@ -9,10 +9,10 @@ stages:
   - spectral
   - compileMarc2017
   - marc
-  - compileAbaqus2016
   - compileAbaqus2017
   - example
   - performance
+  - createPackage
   - createDocumentation
   - saveDocumentation
   - updateMaster
@@ -67,7 +67,6 @@ variables:
   PETSc_MPICH_Intel:               "$PETSc3_9_1MPICH3_2Intel18_1"
   PETSc_MPICH_GNU:                 "$PETSc3_9_1MPICH3_2GNU7_3"
   # ++++++++++++ FEM +++++++++++++++++++++++++++++++++++++++++++++++++++
-  Abaqus2016:                      "FEM/Abaqus/2016"
   Abaqus2017:                      "FEM/Abaqus/2017"
   MSC2017:                         "FEM/MSC/2017"
   # ------------ Defaults ----------------------------------------------
@@ -373,16 +372,6 @@ J2_plasticBehavior:
     - 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
@@ -423,6 +412,13 @@ SpectralRuntime:
     - master
     - release
 
+###################################################################################################
+createTar:
+  stage: createPackage
+  script:
+    - cd $(mktemp -d)
+    - $DAMASKROOT/PRIVATE/releasing/deployMe.sh $CI_COMMIT_SHA
+
 ###################################################################################################
 AbaqusStd:
   stage: createDocumentation

PRIVATE

@@ -1 +1 @@
-Subproject commit 95fe109961c7e602ceed5fdca367c523ff613e54
+Subproject commit 20881ab8ebe6e64bac939ef6b2f8eb5168601a71

VERSION

@@ -1 +1 @@
-v2.0.2-208-g798a9720
+v2.0.2-226-g6ed1e316

installation/patch/README.md

@@ -14,9 +14,6 @@ patch -p1 < installation/patch/nameOfPatch
   * **fwbw_derivative** switches the default spatial derivative from continuous to forward/backward difference.  
     This generally reduces spurious oscillations in the result as the spatial accuracy of the derivative is then compatible with the underlying solution grid.
 
-  * **PETSc-3.8** adjusts all includes and calls to PETSc to follow the 3.8.x API.
-    This allows to use the most recent version of PETSc.
-
 ## Create patch
 commit your changes
 

lib/damask/util.py

@@ -1,5 +1,4 @@
 # -*- coding: UTF-8 no BOM -*-
-
 import sys,time,random,threading,os,subprocess,shlex
 import numpy as np
 from optparse import Option
@@ -94,13 +93,12 @@ def execute(cmd,
                              stdout = subprocess.PIPE,
                              stderr = subprocess.PIPE,
                              stdin  = subprocess.PIPE)
-  out,error = [i.replace("\x08","") for i in (process.communicate() if streamIn is None 
+  out,error = [i.replace(b"\x08",b"") for i in (process.communicate() if streamIn is None
-                                         else process.communicate(streamIn.read()))]
+                                                else process.communicate(streamIn.read()))]
   os.chdir(initialPath)
   if process.returncode != 0: raise RuntimeError('{} failed with returncode {}'.format(cmd,process.returncode))
   return out,error
 
-
 def coordGridAndSize(coordinates):
   """Determines grid count and overall physical size along each dimension of an ordered array of coordinates"""
   dim    = coordinates.shape[1]

src/DAMASK_marc.f90

@@ -234,8 +234,8 @@ subroutine hypela2(d,g,e,de,s,t,dt,ngens,m,nn,kcus,matus,ndi,nshear,disp, &
 ! Marc common blocks are in fixed format so they have to be reformated to free format (f90)
 ! Beware of changes in newer Marc versions
 
-#include QUOTE(PASTE(../lib/MarcInclude/concom,Marc4DAMASK))                                        ! concom is needed for inc, lovl
+#include QUOTE(PASTE(./MarcInclude/concom,Marc4DAMASK))                                             ! concom is needed for inc, lovl
-#include QUOTE(PASTE(../lib/MarcInclude/creeps,Marc4DAMASK))                                        ! creeps is needed for timinc (time increment)
+#include QUOTE(PASTE(./MarcInclude/creeps,Marc4DAMASK))                                             ! creeps is needed for timinc (time increment)
 
  logical :: cutBack
  real(pReal), dimension(6) ::   stress

src/crystallite.f90

@@ -3256,11 +3256,6 @@ logical function crystallite_integrateStress(&
                                      p, &
                                      jacoCounterLp, &
                                      jacoCounterLi                                                    ! counters to check for Jacobian update
- integer(pLongInt) ::                tick = 0_pLongInt, &
-                                     tock = 0_pLongInt, &
-                                     tickrate, &
-                                     maxticks
-
  external :: &
    dgesv