Skip to content

Commit ca92907

Browse files
committed
Merge branch 'housekeeping_2025-11-14' into 'development'
housekeeping 2025-11-14 Closes #562, #533, #564, #421, #576, and #566 See merge request damask/DAMASK!1154
2 parents abbf1f5 + 4a829db commit ca92907

File tree

158 files changed

+576
-581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+576
-581
lines changed

.gitlab-ci.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -204,14 +204,12 @@ pytest_previous:
204204
doctest:
205205
extends: [.processing, .python]
206206
script:
207-
- export DAMASK_ROOT=$(pwd)
208-
- PYTHONPATH=${DAMASK_ROOT}/python:${PYTHONPATH}
209207
- cd python
210-
- cp tests/resources/doctest/* .
208+
- cp tests/resources/doctest/*.* .
211209
# pretend neper to be present such that call to /bin/neper does not fail
212210
- echo '#!/usr/bin/env bash' > /bin/neper
213211
- chmod +x /bin/neper
214-
- python3 -m pytest -v --doctest-modules -k 'not result' damask
212+
- PYTHONPATH=${PWD}:${PYTHONPATH} NO_COLOR=1 python3 -m pytest -v --doctest-modules damask
215213

216214

217215
####################################################################################################
@@ -225,7 +223,7 @@ open-source:
225223
- long_running
226224
needs: []
227225
before_script:
228-
- cmake -DGRID=ON -DMESH=ON -B build && cmake --build build --parallel 4 --target install
226+
- cmake -DGRID=ON -DMESH=ON -B build -G Ninja && cmake --build build --parallel 4 --target install
229227
- source env/DAMASK.sh
230228
script:
231229
- cd PRIVATE/testing
@@ -247,7 +245,7 @@ c++-linter:
247245
script:
248246
- source env/DAMASK.sh
249247
- ./bin/DAMASK_test
250-
- find . -name '*.gcda' -not -path "**/test/*" -exec gcov {} \;
248+
- find . -name '*.gcda' -not -path "**/test/*" -exec gcov {} \; | grep src/.\*.f90 -A+1 || true
251249
- ctest --test-dir build/src/test/cpp --output-on-failure -j"$(nproc)" --no-tests=ignore
252250
parallel:
253251
matrix:

CITATION.cff

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@ authors:
1515
orcid: 'https://orcid.org/0000-0002-3738-7363'
1616
- given-names: Philip
1717
family-names: Eisenlohr
18-
orcid: 'https://orcid.org/0000-0002-8220-5995'
1918
2019
affiliation: Michigan State University
20+
orcid: 'https://orcid.org/0000-0002-8220-5995'
2121
- given-names: Sharan
2222
family-names: Roongta
23+
2324
affiliation: Max-Planck-Institut für Nachhaltige Materialien GmbH
24-
2525
orcid: 'https://orcid.org/0000-0001-5754-068X'
2626
- given-names: Daniel
2727
family-names: Otto de Mentock
28-
email: d.mentock@mpie.de
28+
email: d.mentock@mpi-susmat.de
2929
affiliation: Max-Planck-Institut für Nachhaltige Materialien GmbH
3030
orcid: 'https://orcid.org/0009-0005-8363-6112'
3131
- given-names: Yi
3232
family-names: Hu
33-
email: y.hu@mpie.de
33+
email: y.hu@mpi-susmat.de
3434
affiliation: Max-Planck-Institut für Nachhaltige Materialien GmbH
3535
orcid: 'https://orcid.org/0000-0003-2775-6169'
3636
- given-names: Nikhil
@@ -40,12 +40,12 @@ authors:
4040
orcid: 'https://orcid.org/0000-0003-0843-3903'
4141
- given-names: Pratheek
4242
family-names: Shanthraj
43+
4344
affiliation: United Kingdom Atomic Energy Authority
4445
orcid: 'https://orcid.org/0000-0002-6324-0306'
45-
4646
- given-names: Franz
4747
family-names: Roters
48-
email: f.roters@mpie.de
48+
email: f.roters@mpi-susmat.de
4949
affiliation: Max-Planck-Institut für Nachhaltige Materialien GmbH
5050
orcid: 'https://orcid.org/0000-0002-9098-9566'
5151
identifiers:

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: AGPL-3.0-or-later
12
cmake_minimum_required(VERSION 3.18.0)
23
set(CMAKE_CXX_STANDARD 23)
34
set(CMAKE_C_STANDARD 17)

PRIVATE

cmake/Compiler-GNU.cmake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: AGPL-3.0-or-later
12
###################################################################################################
23
# GNU Compiler
34
###################################################################################################
@@ -18,9 +19,9 @@ elseif(OPTIMIZATION STREQUAL "AGGRESSIVE")
1819
endif()
1920

2021
if(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 14)
21-
set(STANDARD_CHECK "-std=f2018 -pedantic-errors" )
22+
set(STANDARD_CHECK "-std=f2018 -pedantic-errors")
2223
else()
23-
set(STANDARD_CHECK "-std=f2023 -pedantic-errors" )
24+
set(STANDARD_CHECK "-std=f2023 -pedantic-errors")
2425
endif()
2526

2627
if(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 12)

cmake/Compiler-IntelLLVM.cmake

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# SPDX-License-Identifier: AGPL-3.0-or-later
12
###################################################################################################
23
# IntelLLVM Compiler
34
###################################################################################################
@@ -15,14 +16,12 @@ elseif(OPTIMIZATION STREQUAL "AGGRESSIVE")
1516
set(OPTIMIZATION_FLAGS "-O3 -fp-model strict -xHost -align array64byte") # -ipo/-flto give linker error
1617
endif()
1718

18-
# set(STANDARD_CHECK "-stand f23 -standard-semantics -assume nostd_mod_proc_name")
19-
# -assume std_mod_proc_name (included in -standard-semantics) causes problems if other modules
20-
# (PETSc, HDF5) are not compiled with this option
21-
# https://community.intel.com/t5/Intel-Fortran-Compiler/building-and-linking-against-a-Fortran-dynamic-library-on-Linux/td-p/1178514
22-
# -standard-semantics causes a bizzare increase in runtime on matesting (Intel(R) Xeon(R) CPU X5670)
23-
# so use only -fpscomp logicals.
24-
# https://fortran-lang.discourse.group/t/performance-drop-when-using-intel-oneapi-with-standard-sematics-option/9944/5
25-
set(STANDARD_CHECK "-stand f23 -fpscomp logicals")
19+
set(STANDARD_CHECK "-stand f23 -fpscomp logicals -assume noold_unit_star")
20+
# -standard-semantics causes a bizzare increase in runtime on matesting (Intel(R) Xeon(R) CPU
21+
# X5670), o only enforce a logical representation that is compatible with C and enable to close the
22+
# output unit.
23+
# https://fortran-lang.discourse.group/t/performance-drop-when-using-intel-oneapi-with-standard-sematics-option/9944/5
24+
# https://community.intel.com/t5/Intel-Fortran-Compiler/Redirecting-File-STDOUT-and-STDERR-in-Intel-Fortran-Without/m-p/1550590
2625

2726
# Link against shared Intel libraries instead of static ones:
2827
set(LINKER_FLAGS "${LINKER_FLAGS} -shared-intel")

cmake/Compiler-LLVMFlang.cmake

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
1+
# SPDX-License-Identifier: AGPL-3.0-or-later
12
###################################################################################################
23
# LLVM Compiler
34
###################################################################################################
4-
set(Fortran_COMPILER_VERSION_MIN 20)
5+
set(Fortran_COMPILER_VERSION_MIN 22)
56

67
if(OPENMP)
78
set(OPENMP_FLAGS "-fopenmp")
89
endif()
910

10-
set(STANDARD_CHECK "-std=f2018 -pedantic" )
11+
if(OPTIMIZATION STREQUAL "DEBUG")
12+
set(OPTIMIZATION_FLAGS "-O0")
13+
elseif(OPTIMIZATION STREQUAL "OFF")
14+
set(OPTIMIZATION_FLAGS "-O0")
15+
elseif(OPTIMIZATION STREQUAL "DEFENSIVE")
16+
set(OPTIMIZATION_FLAGS "-O2 -mtune=native")
17+
elseif(OPTIMIZATION STREQUAL "AGGRESSIVE")
18+
set(OPTIMIZATION_FLAGS "-O3 -march=native -funroll-loops -ftree-vectorize -flto")
19+
endif()
20+
21+
set(STANDARD_CHECK "-std=f2018 -pedantic")
22+
23+
#------------------------------------------------------------------------------------------------
24+
# Fine tuning compilation options
25+
#------------------------------------------------------------------------------------------------
26+
27+
# position independent code:
28+
set(COMPILE_FLAGS "${COMPILE_FLAGS} -fPIE")

env/DAMASK.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# sets up an environment for DAMASK on bash
1+
# SPDX-License-Identifier: AGPL-3.0-or-later
2+
# set up an environment for DAMASK on bash
23
# usage: source DAMASK.sh
34

45
function canonicalPath {

env/DAMASK.zsh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# sets up an environment for DAMASK on zsh
1+
# SPDX-License-Identifier: AGPL-3.0-or-later
2+
# set up an environment for DAMASK on zsh
23
# usage: source DAMASK.zsh
34

45
function canonicalPath {

install/MarcMentat/MSC_modifications.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#!/usr/bin/env python3
2+
# SPDX-License-Identifier: AGPL-3.0-or-later
23

34
import os
45
import sys

0 commit comments

Comments
 (0)