diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71f1d6652..a33a5a078 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -187,8 +187,6 @@ grid_mech_compile_Intel: stage: compilePETSc script: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - - cp -r grid_mech_compile grid_mech_compile_Intel - - grid_mech_compile_Intel/test.py - cd pytest - pytest -k 'compile and grid' --basetemp=${TESTROOT}/compile_grid_Intel except: @@ -199,8 +197,6 @@ Compile_FEM_Intel: stage: compilePETSc script: - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel - - cp -r FEM_compile FEM_compile_Intel - - FEM_compile_Intel/test.py - cd pytest - pytest -k 'compile and mesh' --basetemp=${TESTROOT}/compile_mesh_Intel except: @@ -211,8 +207,6 @@ grid_mech_compile_GNU: stage: compilePETSc script: - module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU - - cp -r grid_mech_compile grid_mech_compile_GNU - - grid_mech_compile_GNU/test.py - cd pytest - pytest -k 'compile and grid' --basetemp=${TESTROOT}/compile_grid_GNU except: @@ -223,8 +217,6 @@ Compile_FEM_GNU: stage: compilePETSc script: - module load $GNUCompiler $MPICH_GNU $PETSc_MPICH_GNU - - cp -r FEM_compile FEM_compile_GNU - - FEM_compile_GNU/test.py - cd pytest - pytest -k 'compile and mesh' --basetemp=${TESTROOT}/compile_mesh_GNU except: diff --git a/PRIVATE b/PRIVATE index 9f453aa6d..34c896194 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 9f453aa6d2ec2fe1ff192e422a7f596fc46cc778 +Subproject commit 34c89619411e2a0e84f3efc122589d41e270b640 diff --git a/python/damask/_environment.py b/python/damask/_environment.py index 9983a91aa..1aa5e8384 100644 --- a/python/damask/_environment.py +++ b/python/damask/_environment.py @@ -3,10 +3,6 @@ from pathlib import Path class Environment: - def __init__(self): - """Do Nothing.""" - pass - @property def screen_size(self): width = 1024 @@ -43,8 +39,3 @@ class Environment: def root_dir(self): """Return DAMASK root path.""" return Path(__file__).parents[2] - - - # for compatibility - def rootDir(self): - return str(self.root_dir) diff --git a/src/DAMASK_interface.f90 b/src/DAMASK_interface.f90 index 52971ae06..70f343a15 100644 --- a/src/DAMASK_interface.f90 +++ b/src/DAMASK_interface.f90 @@ -126,9 +126,9 @@ subroutine DAMASK_interface_init if (err /= 0) call quit(1) select case(trim(arg)) ! extract key case ('-h','--help') - print'(a)', ' #######################################################################' + print'(/,a)',' #######################################################################' print'(a)', ' DAMASK Command Line Interface:' - print'(a)', ' For PETSc-based solvers for the Düsseldorf Advanced Material Simulation Kit' + print'(a)', ' Düsseldorf Advanced Material Simulation Kit with PETSc-based solvers' print'(a,/)',' #######################################################################' print'(a,/)',' Valid command line switches:' print'(a)', ' --geom (-g, --geometry)'