Skip to content

Commit 665463d

Browse files
committed
Merge branch 'housekeeping_2026-03-01' into 'development'
housekeeping 2026-03-01 See merge request damask/DAMASK!1182
2 parents 22c0eba + 3e04965 commit 665463d

12 files changed

Lines changed: 122 additions & 393 deletions

File tree

.mailmap

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# git log --format="%aN <%aE>" | sort -u should give no duplicates
12
Aadhithyan Kannan <aadhi.kannan@kuleuven.be> <aadhi@landau.dyn.cs.kuleuven.be>
23
Abisheik Panneerselvam <a.panneerselvam@mpie.de> <a.panneerselvam@maws04.mpie.de>
34
Alankar Alankar <a.alankar@mpie.de>
@@ -11,6 +12,7 @@ Cathy Bing <zhangrux@msu.edu>
1112
Cathy Bing <zhangrux@msu.edu> <sfzrx@mail.ustc.edu.cn>
1213
Chen Zhang <zhangc43@egr.msu.edu>
1314
Chen Zhang <zhangc43@egr.msu.edu> <chenzhang8722@gamil.com>
15+
Chen Zhang <zhangc43@egr.msu.edu> <chenzhang8722@gmail.com>
1416
Chen Zhang <zhangc43@egr.msu.edu> <zhangc43@baron.egr.msu.edu>
1517
Christoph Kords <c.kords@mpie.de>
1618
Chuanlai Liu <c.liu@mpie.de>

.prospector.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
pydocstyle:
2+
disable:
3+
- D203 # numpydoc conformant
4+
- D212 # numpydoc conformant
5+
- D413 # numpydoc conformant
6+
- D417 # numpydoc conformant
7+
pycodestyle:
8+
disable:
9+
- E116
10+
- E741
11+
- N817 # until we have a solution for xml.etree.ElementTree as ET

.yamllint.yaml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
3+
extends: default
4+
5+
rules:
6+
line-length:
7+
max: 256
8+
colons:
9+
max-spaces-after: 32
10+
commas:
11+
min-spaces-after: 1
12+
max-spaces-after: 8
13+
max-spaces-before: 8
14+
brackets:
15+
max-spaces-inside: 8
16+
braces:
17+
max-spaces-inside: 8
18+
new-line-at-end-of-file: false

cmake/Compiler-LLVMFlang.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
###################################################################################################
33
# LLVM Compiler
44
###################################################################################################
5-
set(Fortran_COMPILER_VERSION_MIN 22)
5+
set(Fortran_COMPILER_VERSION_MIN 23)
66

77
set(_OPTIMIZATION_OFF "-O0")
88
set(_OPTIMIZATION_DEBUG "${_OPTIMIZATION_OFF}")

python/damask/_orientation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ def from_ODF(weights: np.ndarray,
813813
shape : (sequence of) int, optional
814814
Output shape. Defaults to None, which gives a scalar.
815815
degrees : bool, optional
816-
Angles are given in degrees. Defaults to True.
816+
Angles are given in degrees. Defaults to False.
817817
fractions : bool, optional
818818
ODF values correspond to volume fractions, not probability densities.
819819
Defaults to True.
@@ -849,7 +849,7 @@ def from_ODF(weights: np.ndarray,
849849
probability densities, p, defined on grid points with ϕ = 0 will never
850850
result in reconstructed orientations as their dV/V = p dγ = p × 0.
851851
Hence, it is recommended to transform any such dataset to a
852-
cell-centered version, which avoids grid points at ϕ = 0.
852+
cell-centered variant, which avoids grid points at ϕ = 0.
853853
854854
References
855855
----------

python/damask/_rotation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@ def from_ODF(weights: np.ndarray,
12971297
shape : (sequence of) int, optional
12981298
Output shape. Defaults to None, which gives a scalar.
12991299
degrees : bool, optional
1300-
Euler space grid coordinates are in degrees. Defaults to True.
1300+
Euler space grid coordinates are in degrees. Defaults to False.
13011301
fractions : bool, optional
13021302
ODF values correspond to volume fractions, not probability densities.
13031303
Defaults to True.

python/tests/resources/Rotation/Visualize_hybridIA_sampling.ipynb

Lines changed: 0 additions & 276 deletions
This file was deleted.

0 commit comments

Comments
 (0)