From 4c0fa69dae2e565f2aa0a82fd3672226ebe26a7d Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Wed, 21 Oct 2020 19:40:36 +0200
Subject: [PATCH 1/3] avoid problems with MPIE\\damask_user name

---
 .gitlab-ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f1e67a115..c7827ff52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,7 +108,7 @@ Pytest_python:
   stage: python
   script:
     - cd $DAMASKROOT/python
-    - pytest
+    - pytest --basetemp=/tmp/test_$CI_PIPELINE_ID
   except:
     - master
     - release
@@ -194,7 +194,7 @@ grid_mech_compile_Intel:
     - cp -r grid_mech_compile grid_mech_compile_Intel
     - grid_mech_compile_Intel/test.py
     - cd pytest
-    - pytest -k 'compile and grid'
+    - pytest -k 'compile and grid' --basetemp=/tmp/test_intel_grid_$CI_PIPELINE_ID
   except:
     - master
     - release
@@ -206,7 +206,7 @@ Compile_FEM_Intel:
     - cp -r FEM_compile FEM_compile_Intel
     - FEM_compile_Intel/test.py
     - cd pytest
-    - pytest -k 'compile and mesh'
+    - pytest -k 'compile and mesh' --basetemp=/tmp/test_intel_mesh_$CI_PIPELINE_ID
   except:
     - master
     - release
@@ -218,7 +218,7 @@ grid_mech_compile_GNU:
     - cp -r grid_mech_compile grid_mech_compile_GNU
     - grid_mech_compile_GNU/test.py
     - cd pytest
-    - pytest -k 'compile and grid'
+    - pytest -k 'compile and grid' --basetemp=/tmp/test_gnu_grid_$CI_PIPELINE_ID
   except:
     - master
     - release
@@ -230,7 +230,7 @@ Compile_FEM_GNU:
     - cp -r FEM_compile FEM_compile_GNU
     - FEM_compile_GNU/test.py
     - cd pytest
-    - pytest -k 'compile and mesh'
+    - pytest -k 'compile and mesh' --basetemp=/tmp/test_gnu_mesh_$CI_PIPELINE_ID
   except:
     - master
     - release

From c7040ff22cd639ecd3795bed0904b65522e1d2d5 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Wed, 21 Oct 2020 20:48:42 +0200
Subject: [PATCH 2/3] follow yammlint rules

and make it readable for humans
---
 .../SpectralMethod/Polycrystal/tensionX.yaml   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/examples/SpectralMethod/Polycrystal/tensionX.yaml b/examples/SpectralMethod/Polycrystal/tensionX.yaml
index 5c82d0eec..6e86fdcf2 100644
--- a/examples/SpectralMethod/Polycrystal/tensionX.yaml
+++ b/examples/SpectralMethod/Polycrystal/tensionX.yaml
@@ -1,14 +1,24 @@
+---
+
 step:
   - mech:
-      dot_F: [1.0e-3,0,0,  0,x,0,  0,0,x]
-      P:     [     x,x,x,  x,0,x,  x,x,0]
+      dot_F: [1.0e-3, 0, 0,
+              0,      x, 0,
+              0,      0, x]
+      P: [x, x, x,
+          x, 0, x,
+          x, x, 0]
     discretization:
       t: 10
       N: 40
       f_out: 4
   - mech:
-      dot_F: [1.0e-3,0,0,  0,x,0,  0,0,x]
-      P:     [     x,x,x,  x,0,x,  x,x,0]
+      dot_F: [1.0e-3, 0, 0,
+              0,      x, 0,
+              0,      0, x]
+      P: [x, x, x,
+          x, 0, x,
+          x, x, 0]
     discretization:
       t: 60
       N: 60

From 8c2b7de743b0dac0622607e92b52384e111f3de2 Mon Sep 17 00:00:00 2001
From: Martin Diehl <mail@martin-diehl.net>
Date: Wed, 21 Oct 2020 21:04:17 +0200
Subject: [PATCH 3/3] better directory structure

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c7827ff52..7d8b1acd1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -108,7 +108,7 @@ Pytest_python:
   stage: python
   script:
     - cd $DAMASKROOT/python
-    - pytest --basetemp=/tmp/test_$CI_PIPELINE_ID
+    - pytest --basetemp=/tmp/${CI_PIPELINE_ID}/python
   except:
     - master
     - release
@@ -194,7 +194,7 @@ grid_mech_compile_Intel:
     - cp -r grid_mech_compile grid_mech_compile_Intel
     - grid_mech_compile_Intel/test.py
     - cd pytest
-    - pytest -k 'compile and grid' --basetemp=/tmp/test_intel_grid_$CI_PIPELINE_ID
+    - pytest -k 'compile and grid' --basetemp=/tmp/${CI_PIPELINE_ID}/compile_grid_Intel
   except:
     - master
     - release
@@ -206,7 +206,7 @@ Compile_FEM_Intel:
     - cp -r FEM_compile FEM_compile_Intel
     - FEM_compile_Intel/test.py
     - cd pytest
-    - pytest -k 'compile and mesh' --basetemp=/tmp/test_intel_mesh_$CI_PIPELINE_ID
+    - pytest -k 'compile and mesh' --basetemp=/tmp/${CI_PIPELINE_ID}/compile_mesh_Intel
   except:
     - master
     - release
@@ -218,7 +218,7 @@ grid_mech_compile_GNU:
     - cp -r grid_mech_compile grid_mech_compile_GNU
     - grid_mech_compile_GNU/test.py
     - cd pytest
-    - pytest -k 'compile and grid' --basetemp=/tmp/test_gnu_grid_$CI_PIPELINE_ID
+    - pytest -k 'compile and grid' --basetemp=/tmp/${CI_PIPELINE_ID}/compile_grid_GNU
   except:
     - master
     - release
@@ -230,7 +230,7 @@ Compile_FEM_GNU:
     - cp -r FEM_compile FEM_compile_GNU
     - FEM_compile_GNU/test.py
     - cd pytest
-    - pytest -k 'compile and mesh' --basetemp=/tmp/test_gnu_mesh_$CI_PIPELINE_ID
+    - pytest -k 'compile and mesh' --basetemp=/tmp/${CI_PIPELINE_ID}/compile_mesh_GNU
   except:
     - master
     - release
@@ -252,7 +252,7 @@ Pytest_grid:
   script:
     - module load $IntelCompiler $MPICH_Intel $PETSc_MPICH_Intel
     - cd pytest
-    - pytest -m 'not compile'
+    - pytest -m 'not compile' --basetemp=/tmp/${CI_PIPELINE_ID}/fortran
   except:
     - master
     - release