Skip to content

Commit c71b1e9

Browse files
Aadhi2012Aadhi2012
committed
Merge branch 'housekeeping_2025-07-23' into 'development'
housekeeping 2025-07-23 See merge request damask/DAMASK!1113
2 parents b606063 + f56f08d commit c71b1e9

30 files changed

+92
-80
lines changed

‎.gitlab-ci.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ Marc_compile:
282282
- cmake --build builddir --target install
283283
- cd PRIVATE/testing
284284
script:
285-
- pytest -v -k configexamples
285+
- python3 -X faulthandler -m pytest -p no:faulthandler -v -k configexamples # https://blog.xmatthias.com/post/pytest-debug-segfault/
286286

287287
configexamples_debug_GCC:
288288
extends: .configexamples_debug
@@ -302,7 +302,6 @@ Marc_run:
302302
script:
303303
- cd ${CI_PROJECT_DIR}/PRIVATE/testing
304304
- pytest -k 'not compile and Marc'
305-
allow_failure: true
306305

307306
# Needs closer look
308307
# Phenopowerlaw_singleSlip:
@@ -324,7 +323,6 @@ grid_performance:
324323
- cp statistics/performance.txt .
325324
artifacts:
326325
paths: [performance.txt]
327-
expire_in: 1 month
328326

329327

330328
####################################################################################################
@@ -339,20 +337,18 @@ grid_performance:
339337
before_script:
340338
- git config --global user.name "testbot"
341339
- git config --global user.email "testbot@damask-multiphysics.org"
340+
rules: [if: $CI_COMMIT_BRANCH == 'development']
342341

343342
update_statistics:
344343
extends: .update
345-
needs:
346-
- job: grid_performance
347-
artifacts: true
344+
dependencies:
345+
- grid_performance
348346
script:
349347
- git clone -q https://damask_user:${STATISTICS_TOKEN}@git.damask-multiphysics.org/damask/statistics.git
350348
- cp performance.txt statistics/
351349
- cd statistics
352-
- git add performance.txt
353-
- git commit -m ${CI_PIPELINE_ID}_${CI_COMMIT_SHA}
350+
- git commit -m ${CI_PIPELINE_ID}_${CI_COMMIT_SHA} performance.txt
354351
- git push
355-
rules: [if: $CI_COMMIT_BRANCH == 'development']
356352

357353
update_revision:
358354
extends: .update
@@ -365,7 +361,6 @@ update_revision:
365361
git diff-index --quiet HEAD ||
366362
git commit VERSION -m "[skip ci] updated version information after successful test of $VERSION"
367363
- if [ ${CI_COMMIT_SHA} == $(git rev-parse HEAD^) ]; then git push --atomic --no-verify origin HEAD:development HEAD:master; fi
368-
rules: [if: $CI_COMMIT_BRANCH == 'development']
369364

370365

371366
####################################################################################################

‎.gitlab/issue_templates/new_release.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Detailed instructions for each step are documented in the [wiki](https://git.dam
1616
- [ ] Arch Linux (PKGBUILD)
1717
- [ ] Ubuntu (Launchpad)
1818
- [ ] Flatpak (Flathub)
19+
- [ ] Homebrew
1920
- Open build service
2021
- [ ] Debian
2122
- [ ] Fedora/Suse

‎PRIVATE‎

‎cmake/Compiler-GNU.cmake‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,12 @@ set (COMPILE_FLAGS "${COMPILE_FLAGS} -Wsuggest-attribute=noreturn")
109109
set (COMPILE_FLAGS "${COMPILE_FLAGS} -Wconversion-extra")
110110
set (COMPILE_FLAGS "${COMPILE_FLAGS} -Wimplicit-procedure")
111111
set (COMPILE_FLAGS "${COMPILE_FLAGS} -Wunused-parameter")
112+
set (COMPILE_FLAGS "${COMPILE_FLAGS} -Wimplicit-interface")
113+
114+
# suppress many false positives
115+
set (COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-maybe-uninitialized")
116+
# suppress warnings resulting from MPI_f08
117+
set (COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-c-binding-type")
112118

113119
# print summary of floating point exeptions (invalid,zero,overflow,underflow,inexact,denormal):
114120
set (COMPILE_FLAGS "${COMPILE_FLAGS} -ffpe-summary=all")
@@ -119,7 +125,6 @@ set (COMPILE_FLAGS "${COMPILE_FLAGS} -frounding-math")
119125
set (COMPILE_FLAGS "${COMPILE_FLAGS} -fsignaling-nans")
120126

121127
# Additional options
122-
# -Wimplicit-interface: no interfaces for lapack/MPI routines
123128
# -Wunsafe-loop-optimizations: warn if the loop cannot be optimized due to nontrivial assumptions
124129

125130
#------------------------------------------------------------------------------------------------

‎python/damask/_vtk.py‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@
3030
vtkRectilinearGrid,
3131
vtkUnstructuredGrid,
3232
vtkPolyData,
33+
VTK_TRIANGLE,
34+
VTK_QUAD,
35+
VTK_TETRA,
36+
VTK_HEXAHEDRON,
3337
)
3438
from vtkmodules.vtkIOLegacy import (
3539
vtkGenericDataObjectReader,
@@ -56,12 +60,6 @@
5660
from vtkmodules.vtkRenderingAnnotation import (
5761
vtkScalarBarActor,
5862
)
59-
from vtkmodules.util.vtkConstants import (
60-
VTK_TRIANGLE,
61-
VTK_QUAD,
62-
VTK_TETRA,
63-
VTK_HEXAHEDRON,
64-
)
6563
from vtkmodules.util.numpy_support import (
6664
numpy_to_vtk,
6765
numpy_to_vtkIdTypeArray,

‎python/damask/util.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@ def pass_signal(sig,_,proc,default):
196196

197197
return stdioTuple(stdout, stderr)
198198

199+
199200
@_contextlib.contextmanager
200201
def open_text(fname: _FileHandle,
201202
mode: _Literal['r','w'] = 'r') -> _Generator[_TextIO, None, None]: # noqa
@@ -225,6 +226,7 @@ def open_text(fname: _FileHandle,
225226
else:
226227
yield fname
227228

229+
228230
def time_stamp() -> str:
229231
"""
230232
Provide current time as formatted string.

‎python/tests/test_GeomGrid.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ def test_rotate360(default,axis_angle):
264264
assert default == modified
265265

266266
@pytest.mark.parametrize('Eulers',[[32.0,68.0,21.0],
267-
[0.0,32.0,240.0]])
267+
[0.0,32.0,240.0]])
268268
def test_rotate(default,update,res_path,Eulers):
269269
modified = default.rotate(Rotation.from_Euler_angles(Eulers,degrees=True))
270270
tag = f'Eulers_{util.srepr(Eulers,"-")}'

‎src/CLI.f90‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,8 @@ subroutine CLI_init()
7878
#define PETSC_DOI '10.2172/2337606'
7979
#elif PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR==22
8080
#define PETSC_DOI '10.2172/2476320'
81+
#elif PETSC_VERSION_MAJOR==3 && PETSC_VERSION_MINOR==23
82+
#define PETSC_DOI '10.2172/2565610'
8183
#endif
8284
character(len=:), allocatable :: &
8385
commandLine, & !< command line call as string

‎src/HDF5_utilities.f90‎

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@
55
!> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH
66
!> @author Philip Eisenlohr, Michigan State University
77
!--------------------------------------------------------------------------------------------------
8+
#ifdef PETSC
9+
#include <petsc/finclude/petscsys.h>
10+
#endif
811
module HDF5_utilities
912
use IO
1013
use HDF5
1114
#ifdef PETSC
12-
#include <petsc/finclude/petscsys.h>
1315
use PETScSys
1416
#ifndef PETSC_HAVE_MPI_F90MODULE_VISIBILITY
1517
use MPI_f08
@@ -659,7 +661,7 @@ end subroutine HDF5_setLink
659661

660662

661663
!--------------------------------------------------------------------------------------------------
662-
!> @brief read dataset of type real with 1 dimension
664+
!> @brief Read dataset of type real with 1 dimension.
663665
!--------------------------------------------------------------------------------------------------
664666
subroutine HDF5_read_real1(dataset,loc_id,datasetName,parallel)
665667

@@ -693,7 +695,7 @@ subroutine HDF5_read_real1(dataset,loc_id,datasetName,parallel)
693695
end subroutine HDF5_read_real1
694696

695697
!--------------------------------------------------------------------------------------------------
696-
!> @brief read dataset of type real with 2 dimensions
698+
!> @brief Read dataset of type real with 2 dimensions.
697699
!--------------------------------------------------------------------------------------------------
698700
subroutine HDF5_read_real2(dataset,loc_id,datasetName,parallel)
699701

@@ -727,7 +729,7 @@ subroutine HDF5_read_real2(dataset,loc_id,datasetName,parallel)
727729
end subroutine HDF5_read_real2
728730

729731
!--------------------------------------------------------------------------------------------------
730-
!> @brief read dataset of type real with 2 dimensions
732+
!> @brief Read dataset of type real with 2 dimensions.
731733
!--------------------------------------------------------------------------------------------------
732734
subroutine HDF5_read_real3(dataset,loc_id,datasetName,parallel)
733735

@@ -761,7 +763,7 @@ subroutine HDF5_read_real3(dataset,loc_id,datasetName,parallel)
761763
end subroutine HDF5_read_real3
762764

763765
!--------------------------------------------------------------------------------------------------
764-
!> @brief read dataset of type real with 4 dimensions
766+
!> @brief Read dataset of type real with 4 dimensions.
765767
!--------------------------------------------------------------------------------------------------
766768
subroutine HDF5_read_real4(dataset,loc_id,datasetName,parallel)
767769

@@ -796,7 +798,7 @@ subroutine HDF5_read_real4(dataset,loc_id,datasetName,parallel)
796798
end subroutine HDF5_read_real4
797799

798800
!--------------------------------------------------------------------------------------------------
799-
!> @brief read dataset of type real with 5 dimensions
801+
!> @brief Read dataset of type real with 5 dimensions.
800802
!--------------------------------------------------------------------------------------------------
801803
subroutine HDF5_read_real5(dataset,loc_id,datasetName,parallel)
802804

@@ -832,7 +834,7 @@ end subroutine HDF5_read_real5
832834

833835

834836
!--------------------------------------------------------------------------------------------------
835-
!> @brief read dataset of type integer with 1 dimension
837+
!> @brief Read dataset of type integer with 1 dimension.
836838
!--------------------------------------------------------------------------------------------------
837839
subroutine HDF5_read_int1(dataset,loc_id,datasetName,parallel)
838840

@@ -866,7 +868,7 @@ subroutine HDF5_read_int1(dataset,loc_id,datasetName,parallel)
866868
end subroutine HDF5_read_int1
867869

868870
!--------------------------------------------------------------------------------------------------
869-
!> @brief read dataset of type integer with 2 dimensions
871+
!> @brief Read dataset of type integer with 2 dimensions.
870872
!--------------------------------------------------------------------------------------------------
871873
subroutine HDF5_read_int2(dataset,loc_id,datasetName,parallel)
872874

@@ -901,7 +903,7 @@ subroutine HDF5_read_int2(dataset,loc_id,datasetName,parallel)
901903
end subroutine HDF5_read_int2
902904

903905
!--------------------------------------------------------------------------------------------------
904-
!> @brief read dataset of type integer with 3 dimensions
906+
!> @brief Read dataset of type integer with 3 dimensions.
905907
!--------------------------------------------------------------------------------------------------
906908
subroutine HDF5_read_int3(dataset,loc_id,datasetName,parallel)
907909

@@ -921,8 +923,8 @@ subroutine HDF5_read_int3(dataset,loc_id,datasetName,parallel)
921923
myShape = int(shape(dataset),HSIZE_T)
922924

923925
call initialize_read(dset_id,filespace_id,memspace_id,plist_id,aplist_id, &
924-
myStart,totalShape,loc_id,myShape,datasetName, &
925-
misc_optional(parallel,parallel_default))
926+
myStart,totalShape,loc_id,myShape,datasetName, &
927+
misc_optional(parallel,parallel_default))
926928

927929
if (any(totalShape == 0)) return
928930

@@ -935,7 +937,7 @@ subroutine HDF5_read_int3(dataset,loc_id,datasetName,parallel)
935937
end subroutine HDF5_read_int3
936938

937939
!--------------------------------------------------------------------------------------------------
938-
!> @brief read dataset of type integer withh 4 dimensions
940+
!> @brief Read dataset of type integer with 4 dimensions.
939941
!--------------------------------------------------------------------------------------------------
940942
subroutine HDF5_read_int4(dataset,loc_id,datasetName,parallel)
941943

@@ -955,8 +957,8 @@ subroutine HDF5_read_int4(dataset,loc_id,datasetName,parallel)
955957
myShape = int(shape(dataset),HSIZE_T)
956958

957959
call initialize_read(dset_id,filespace_id,memspace_id,plist_id,aplist_id, &
958-
myStart,totalShape,loc_id,myShape,datasetName, &
959-
misc_optional(parallel,parallel_default))
960+
myStart,totalShape,loc_id,myShape,datasetName, &
961+
misc_optional(parallel,parallel_default))
960962

961963
if (any(totalShape == 0)) return
962964

@@ -969,7 +971,7 @@ subroutine HDF5_read_int4(dataset,loc_id,datasetName,parallel)
969971
end subroutine HDF5_read_int4
970972

971973
!--------------------------------------------------------------------------------------------------
972-
!> @brief read dataset of type integer with 5 dimensions
974+
!> @brief Read dataset of type integer with 5 dimensions.
973975
!--------------------------------------------------------------------------------------------------
974976
subroutine HDF5_read_int5(dataset,loc_id,datasetName,parallel)
975977

@@ -989,8 +991,8 @@ subroutine HDF5_read_int5(dataset,loc_id,datasetName,parallel)
989991
myShape = int(shape(dataset),HSIZE_T)
990992

991993
call initialize_read(dset_id,filespace_id,memspace_id,plist_id,aplist_id, &
992-
myStart,totalShape,loc_id,myShape,datasetName, &
993-
misc_optional(parallel,parallel_default))
994+
myStart,totalShape,loc_id,myShape,datasetName, &
995+
misc_optional(parallel,parallel_default))
994996

995997
if (any(totalShape == 0)) return
996998

@@ -1736,7 +1738,7 @@ subroutine initialize_write(dset_id, filespace_id, memspace_id, plist_id, &
17361738
call H5Sselect_hyperslab_f(filespace_id, H5S_SELECT_SET_F, myStart, localShape, hdferr)
17371739
call HDF5_chkerr(hdferr,__FILE__//':'//IO_intAsStr(__LINE__))
17381740

1739-
call H5Pclose_f(dcpl , hdferr)
1741+
call H5Pclose_f(dcpl, hdferr)
17401742
call HDF5_chkerr(hdferr,__FILE__//':'//IO_intAsStr(__LINE__))
17411743

17421744
contains

‎src/IO.f90‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ end function isatty_stdin_C
8585
IO_error, &
8686
IO_warning, &
8787
IO_STDOUT, &
88+
IO_STDERR, &
8889
tokenize
8990

9091
contains

0 commit comments

Comments
 (0)