From 6a258c148f0e21c75faf53f0ce3f5998fcf150c7 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 5 Jul 2023 10:59:05 +0200 Subject: damask: fix build of alpha release (#38457) --- var/spack/repos/builtin/packages/damask-grid/T-init.patch | 11 +++++++++++ var/spack/repos/builtin/packages/damask-grid/package.py | 3 +++ var/spack/repos/builtin/packages/damask-mesh/package.py | 2 ++ 3 files changed, 16 insertions(+) create mode 100644 var/spack/repos/builtin/packages/damask-grid/T-init.patch (limited to 'var') diff --git a/var/spack/repos/builtin/packages/damask-grid/T-init.patch b/var/spack/repos/builtin/packages/damask-grid/T-init.patch new file mode 100644 index 0000000000..22f1c9d2a9 --- /dev/null +++ b/var/spack/repos/builtin/packages/damask-grid/T-init.patch @@ -0,0 +1,11 @@ +--- damask.orig/src/grid/grid_thermal_spectral.f90 2023-06-17 00:35:03.454061742 +0200 ++++ damask/src/grid/grid_thermal_spectral.f90 2023-06-17 00:38:50.641104409 +0200 +@@ -110,7 +110,7 @@ + T_current = discretization_grid_getInitialCondition('T') + T_lastInc = T_current + T_stagInc = T_current +- dotT_lastInc = 0.0_pReal ++ dotT_lastInc = 0.0_pREAL * T_current + + !-------------------------------------------------------------------------------------------------- + ! initialize solver specific parts of PETSc diff --git a/var/spack/repos/builtin/packages/damask-grid/package.py b/var/spack/repos/builtin/packages/damask-grid/package.py index 53889d4107..f23f754c90 100644 --- a/var/spack/repos/builtin/packages/damask-grid/package.py +++ b/var/spack/repos/builtin/packages/damask-grid/package.py @@ -40,6 +40,9 @@ class DamaskGrid(CMakePackage): depends_on("fftw+mpi") depends_on("libfyaml", when="@3.0.0-alpha7:") + # proper initialization of temperature to avoid segmentation fault. created by @MarDiehl + patch("T-init.patch", when="@3.0.0-alpha7") + # relax Fortran sourc limit to 132 char to enable PETSc macro expansion. created by @MarDiehl patch("long-lines.patch", when="@3.0.0-alpha7") patch("CMakeDebugRelease.patch", when="@3.0.0-alpha4") diff --git a/var/spack/repos/builtin/packages/damask-mesh/package.py b/var/spack/repos/builtin/packages/damask-mesh/package.py index 8e94a00419..893e72fa3c 100644 --- a/var/spack/repos/builtin/packages/damask-mesh/package.py +++ b/var/spack/repos/builtin/packages/damask-mesh/package.py @@ -39,6 +39,8 @@ class DamaskMesh(CMakePackage): depends_on("hdf5@1.10:+mpi+fortran") depends_on("libfyaml", when="@3.0.0-alpha7:") + # relax Fortran sourc limit to 132 char to enable PETSc macro expansion. created by @MarDiehl + patch("long-lines.patch", when="@3.0.0-alpha7") patch("CMakeDebugRelease.patch", when="@3.0.0-alpha4") variant( -- cgit v1.2.3-60-g2f50