diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bae5e3046..b24f01785 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -136,7 +136,7 @@ compile_Marc: - cp ${CI_PROJECT_DIR}/examples/Marc/* . - python3 -c "import damask;damask.solver.Marc().submit_job('r-value','texture',True,'h')" - mkdir ${TESTROOT}/src - - mv ${CI_PROJECT_DIR}/src/DAMASK_Marc.marc + - mv ${CI_PROJECT_DIR}/src/DAMASK_Marc.marc ${TESTROOT}/src ################################################################################################### @@ -145,13 +145,13 @@ open-source: script: - module load ${COMPILER_INTEL} ${MPI_INTEL} ${PETSC_INTEL} - cd PRIVATE/testing/pytest - - pytest -k 'not compile and not Marc' --basetemp ${TESTROOT}/fortran -v + - pytest -k 'not compile and not Marc' --basetemp ${TESTROOT}/open-source -v Marc: stage: fortran script: - cd PRIVATE/testing/pytest - - pytest -k 'not compile and Marc' --damask-root ${TESTROOT} --basetemp ${TESTROOT}/fortran -v + - pytest -k 'not compile and Marc' --damask-root=${TESTROOT} --basetemp ${TESTROOT}/Marc -v # Needs closer look # Phenopowerlaw_singleSlip: @@ -169,7 +169,11 @@ grid_runtime: - make -j2 all install - REPO_DIR=$(mktemp -d) - git clone -q git@git.damask.mpie.de:damask/performance.git ${REPO_DIR} - - ./PRIVATE/testing/runtime.py --input_dir ${CI_PROJECT_DIR}/examples/grid --output_dir ${REPO_DIR} --tag ${CI_COMMIT_SHA} + - > + ${CI_PROJECT_DIR}/PRIVATE/testing/runtime.py + --input_dir ${CI_PROJECT_DIR}/examples/grid + --output_dir ${REPO_DIR} + --tag ${CI_COMMIT_SHA} - if [ ${CI_COMMIT_BRANCH} == development ]; then git commit -am ${CI_PIPELINE_ID}_${CI_COMMIT_SHA}; git push; fi before_script: - ${LOCAL_HOME}/bin/queue ${CI_JOB_ID} --blocking diff --git a/PRIVATE b/PRIVATE index 6b7dfd6e6..7a7588973 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 6b7dfd6e618cccba87ef6640dfd1f8556d235c23 +Subproject commit 7a7588973a9ab48a4980fd67d59ffce7030d71aa diff --git a/python/tests/conftest.py b/python/tests/conftest.py index c4b6d1d6e..15495f9b8 100644 --- a/python/tests/conftest.py +++ b/python/tests/conftest.py @@ -49,9 +49,8 @@ def patch_plt_show(monkeypatch): def pytest_addoption(parser): - parser.addoption("--update", - action="store_true", - default=False) + parser.addoption('--update', action='store_true', default=False, + help='Update reference results.') @pytest.fixture diff --git a/python/tests/test_Rotation.py b/python/tests/test_Rotation.py index 9d0f26bfc..2d623adf5 100644 --- a/python/tests/test_Rotation.py +++ b/python/tests/test_Rotation.py @@ -989,11 +989,19 @@ class TestRotation: with pytest.raises(TypeError): R@data - def test_misorientation(self): + def test_misorientation_invariant(self): R = Rotation.from_random() assert np.allclose(R.misorientation(R).as_matrix(),np.eye(3)) - def test_misorientation360(self): + def test_misorientation_average(self): + """2 times the average is the misorientation.""" + r = Rotation.from_random(2) + a = r[0].misorientation(r[1]).as_axis_angle() + b = r.average().misorientation(r[1]).as_axis_angle() + b[3] = (b[3]*2)%np.pi + assert np.allclose(a,b) + + def test_misorientation_360deg(self): R_1 = Rotation() R_2 = Rotation.from_Euler_angles([360,0,0],degrees=True) assert np.allclose(R_1.misorientation(R_2).as_matrix(),np.eye(3))