Skip to content

Commit 1978793

Browse files
committed
Merge branch '463-avoid-dependence-on-petscsetfptrap-petsc_fp_trap_off' into 'development'
run configexamples test in debug mode Closes #463 See merge request damask/DAMASK!1047
2 parents 4b822eb + 5425b38 commit 1978793

File tree

2 files changed

+37
-3
lines changed

2 files changed

+37
-3
lines changed

.gitlab-ci.yml

+35-2
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,39 @@ setup_Marc:
277277
- mv ${CI_PROJECT_DIR}/src/Marc/DAMASK_Marc.marc ${TESTROOT}/src/Marc
278278

279279

280+
###################################################################################################
281+
282+
.configexamples_debug:
283+
stage: compile
284+
tags:
285+
- matesting2-container-runner
286+
script:
287+
- pytest -k configexamples
288+
289+
configexamples_debug_GCC:
290+
extends: .configexamples_debug
291+
image: git.damask-multiphysics.org:5050/damask/damask/gcc_petsc-default:2025.03.10
292+
before_script:
293+
- tail +$(grep -n 'Configure Actions.*' /petsc/configure.log | cut -f 1 -d:) /petsc/configure.log
294+
- source env/DAMASK.sh
295+
- export OPENBLAS_NUM_THREADS=1
296+
- cmake -B builddir -DDAMASK_SOLVER=grid -DCMAKE_BUILD_TYPE=DEBUG
297+
- cmake --build builddir --target install
298+
- cd PRIVATE/testing
299+
300+
configexamples_debug_oneAPI:
301+
extends: .configexamples_debug
302+
image: git.damask-multiphysics.org:5050/damask/damask/oneapi_petsc-default:2025.03.09
303+
before_script:
304+
- tail +$(grep -n 'Configure Actions.*' /petsc/configure.log | cut -f 1 -d:) /petsc/configure.log
305+
- source env/DAMASK.sh
306+
- export OPENBLAS_NUM_THREADS=1
307+
- sed -i '/set (DEBUG_FLAGS "${DEBUG_FLAGS} -fpe-all=0/d' cmake/Compiler-IntelLLVM.cmake
308+
- sed -i 's/FP_TRAP_ON/FP_TRAP_OFF/g' src/parallelization.f90
309+
- cmake -B builddir -DDAMASK_SOLVER=grid -DCMAKE_BUILD_TYPE=DEBUG
310+
- cmake --build builddir --target install
311+
- cd PRIVATE/testing
312+
280313
###################################################################################################
281314
open-source_GCC:
282315
stage: fortran
@@ -300,7 +333,7 @@ open-source_signal_restart_GCC:
300333
- source /opt/venv/bin/activate
301334
- module load ${COMPILER_INTEL} ${PETSC_INTEL}
302335
- cd $(mktemp -d)
303-
- cmake -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=${TESTROOT} ${CI_PROJECT_DIR}
336+
- cmake -DDAMASK_SOLVER=grid -DCMAKE_INSTALL_PREFIX=${TESTROOT} ${CI_PROJECT_DIR}
304337
- make -j2 all install
305338
- export PATH=${TESTROOT}/bin:${PATH}
306339
- cd ${CI_PROJECT_DIR}
@@ -340,7 +373,7 @@ grid_performance:
340373
script:
341374
- module load ${COMPILER_INTEL} ${PETSC_INTEL}
342375
- cd $(mktemp -d)
343-
- cmake -DOPTIMIZATION=AGGRESSIVE -DDAMASK_SOLVER=GRID -DCMAKE_INSTALL_PREFIX=./ ${CI_PROJECT_DIR}
376+
- cmake -DOPTIMIZATION=AGGRESSIVE -DDAMASK_SOLVER=grid -DCMAKE_INSTALL_PREFIX=./ ${CI_PROJECT_DIR}
344377
- make -j2 all install
345378
- export PATH=${PWD}/bin:${PATH}
346379
- cd $(mktemp -d)

src/phase_mechanical_plastic_dislotwin.f90

+2-1
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ module function plastic_dislotwin_init() result(myPlasticity)
231231
prm%tau_0 = math_expand(pl%get_as1dReal('tau_0', requiredSize=size(N_sl)),N_sl)
232232
prm%B = math_expand(pl%get_as1dReal('B', requiredSize=size(N_sl), &
233233
defaultVal=[(0.0_pREAL,i=1,size(N_sl))]),N_sl)
234-
prm%d_caron = prm%b_sl * pl%get_asReal('D_a')
234+
prm%d_caron = prm%b_sl * pl%get_asReal('D_a')
235235

236236
prm%h_sl_sl = crystal_interaction_SlipBySlip(N_sl,pl%get_as1dReal('h_sl-sl'),phase_lattice(ph))
237237

@@ -271,6 +271,7 @@ module function plastic_dislotwin_init() result(myPlasticity)
271271
prm%q, &
272272
prm%tau_0, &
273273
prm%B, &
274+
prm%d_caron, &
274275
source=emptyRealArray)
275276
allocate(prm%forestProjection(0,0), &
276277
prm%h_sl_sl(0,0)) ! PE: What about P_sl and systems_sl?

0 commit comments

Comments
 (0)