From 759c95471c7d39896c9336e7d1a784c111f1fd32 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Fri, 7 Oct 2022 19:00:09 +0200 Subject: [PATCH 01/12] asymptotic hardening respects own (not other) saturation from @p.eisenlohr --- PRIVATE | 2 +- ...phase_mechanical_plastic_phenopowerlaw.f90 | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/PRIVATE b/PRIVATE index 8c0a24006..48a50a949 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 8c0a24006f355ce8d7602daa77a33348183a2bc7 +Subproject commit 48a50a9494498c59ff4f4cdceb6d51e7068f9b6e diff --git a/src/phase_mechanical_plastic_phenopowerlaw.f90 b/src/phase_mechanical_plastic_phenopowerlaw.f90 index f0dc04869..325e4cd64 100644 --- a/src/phase_mechanical_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanical_plastic_phenopowerlaw.f90 @@ -347,8 +347,7 @@ module function phenopowerlaw_dotState(Mp,ph,en) result(dotState) sumF real(pReal), dimension(param(ph)%sum_N_sl) :: & dot_gamma_sl_pos,dot_gamma_sl_neg, & - right_SlipSlip - + left_SlipSlip associate(prm => param(ph), stt => state(ph), & dot_xi_sl => dotState(indexDotState(ph)%xi_sl(1):indexDotState(ph)%xi_sl(2)), & @@ -356,17 +355,17 @@ module function phenopowerlaw_dotState(Mp,ph,en) result(dotState) dot_gamma_sl => dotState(indexDotState(ph)%gamma_sl(1):indexDotState(ph)%gamma_sl(2)), & dot_gamma_tw => dotState(indexDotState(ph)%gamma_tw(1):indexDotState(ph)%gamma_tw(2))) - call kinetics_sl(Mp,ph,en,dot_gamma_sl_pos,dot_gamma_sl_neg) + call kinetics_sl(Mp,ph,en, dot_gamma_sl_pos,dot_gamma_sl_neg) dot_gamma_sl = abs(dot_gamma_sl_pos+dot_gamma_sl_neg) - call kinetics_tw(Mp,ph,en,dot_gamma_tw) - + call kinetics_tw(Mp,ph,en, dot_gamma_tw) sumF = sum(stt%gamma_tw(:,en)/prm%gamma_char) - xi_sl_sat_offset = prm%f_sat_sl_tw*sqrt(sumF) - right_SlipSlip = sign(abs(1.0_pReal-stt%xi_sl(:,en) / (prm%xi_inf_sl+xi_sl_sat_offset))**prm%a_sl, & - 1.0_pReal-stt%xi_sl(:,en) / (prm%xi_inf_sl+xi_sl_sat_offset)) - dot_xi_sl = prm%h_0_sl_sl * (1.0_pReal + prm%c_1*sumF** prm%c_2) * (1.0_pReal + prm%h_int) & - * matmul(prm%h_sl_sl,dot_gamma_sl*right_SlipSlip) & + xi_sl_sat_offset = prm%f_sat_sl_tw*sqrt(sumF) + left_SlipSlip = sign(abs(1.0_pReal-stt%xi_sl(:,en) / (prm%xi_inf_sl+xi_sl_sat_offset))**prm%a_sl, & + 1.0_pReal-stt%xi_sl(:,en) / (prm%xi_inf_sl+xi_sl_sat_offset)) + + dot_xi_sl = prm%h_0_sl_sl * (1.0_pReal + prm%c_1 * sumF**prm%c_2) * (1.0_pReal + prm%h_int) & + * left_SlipSlip * matmul(prm%h_sl_sl,dot_gamma_sl) & + matmul(prm%h_sl_tw,dot_gamma_tw) dot_xi_tw = prm%h_0_tw_sl * sum(stt%gamma_sl(:,en))**prm%c_3 & From 5337822fffdd70e9a98af64d7d37a2aeccf961bd Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 11 Oct 2022 09:51:49 +0200 Subject: [PATCH 02/12] [skip ci] updated version information after successful test of v3.0.0-alpha7-2-g14c46d4c2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6907b2b5e..3af5587ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha7 +3.0.0-alpha7-2-g14c46d4c2 From 6324dac1c2bb79f0971cdb23b85a8c7b02001131 Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 13 Oct 2022 12:12:42 +0200 Subject: [PATCH 03/12] [skip ci] updated version information after successful test of v3.0.0-alpha7-5-g2e24ce477 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3af5587ce..2aa2161ed 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha7-2-g14c46d4c2 +3.0.0-alpha7-5-g2e24ce477 From b2a600b07d2616c1c91c73641abf4ad7c6582af7 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Oct 2022 12:05:43 +0200 Subject: [PATCH 04/12] new PETSc, new compilers --- .github/workflows/Fortran.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Fortran.yml b/.github/workflows/Fortran.yml index ef63149c8..cd361f248 100644 --- a/.github/workflows/Fortran.yml +++ b/.github/workflows/Fortran.yml @@ -2,7 +2,7 @@ name: Grid and Mesh Solver on: [push] env: - PETSC_VERSION: '3.17.4' + PETSC_VERSION: '3.18.0' HOMEBREW_NO_ANALYTICS: 'ON' # Make Homebrew installation a little quicker HOMEBREW_NO_AUTO_UPDATE: 'ON' HOMEBREW_NO_BOTTLE_SOURCE_FALLBACK: 'ON' @@ -158,7 +158,10 @@ jobs: if: contains( matrix.intel_v, 'classic') run: | cd petsc-${PETSC_VERSION} - ./configure --with-fc=mpiifort --with-cc="mpiicc -cc=icc" --with-cxx="mpiicpc -cxx=icpc" \ + ./configure \ + --with-fc='mpiifort -fc=ifort -diag-disable=10441' \ + --with-cc='mpiicc -cc=icc -diag-disable=10441' \ + --with-cxx='mpiicpc -cxx=icpc -diag-disable=10441' \ --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib make all @@ -166,7 +169,10 @@ jobs: if: contains( matrix.intel_v, 'llvm') run: | cd petsc-${PETSC_VERSION} - ./configure --with-fc=mpiifort --with-cc="mpiicc -cc=icx" --with-cxx="mpiicpc -cxx=icpx" \ + ./configure \ + --with-fc='mpiifort -fc=ifx' \ + --with-cc='mpiicc -cc=icx' \ + --with-cxx='mpiicpc -cxx=icpx' \ --download-fftw --download-hdf5 --download-hdf5-fortran-bindings=1 --download-zlib make all From 8937967067bb3c1b15b642c5e401348a5cf6ccc1 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Oct 2022 13:08:13 +0200 Subject: [PATCH 05/12] length of macro seems to depend on PETSc location --- src/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 192c1f84b..d0a95fa23 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -2,6 +2,7 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") # long lines for interaction matrix set_source_files_properties("lattice.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-240") + set_source_files_properties("parallelization.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-none") endif() file(GLOB damask-sources CONFIGURE_DEPENDS *.f90 *.c) @@ -18,7 +19,7 @@ foreach(solver-source ${solver-sources}) file(READ ${solver-source} content) string(FIND "${content}" "CHKERR" found) if(NOT ${found} EQUAL -1) - set_source_files_properties(${solver-source} PROPERTIES COMPILE_FLAGS "-ffree-line-length-160") + set_source_files_properties(${solver-source} PROPERTIES COMPILE_FLAGS "-ffree-line-length-none") endif() endforeach() From 1b31c9383458ccf8b6bddc7d5a9a4f404e786ba8 Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 13 Oct 2022 17:00:58 +0200 Subject: [PATCH 06/12] [skip ci] updated version information after successful test of v3.0.0-alpha7-7-gb2a600b07 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2aa2161ed..8e3a5107b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha7-5-g2e24ce477 +3.0.0-alpha7-7-gb2a600b07 From 592936f21f24dc9ca64d9662bab3d3dfcf32c12f Mon Sep 17 00:00:00 2001 From: Daniel Otto de Mentock Date: Fri, 14 Oct 2022 11:44:42 +0200 Subject: [PATCH 07/12] missing allocation statement was causing gnu and intel debug compiler to fail --- src/grid/grid_thermal_spectral.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grid/grid_thermal_spectral.f90 b/src/grid/grid_thermal_spectral.f90 index c313fe1fa..a63da30f1 100644 --- a/src/grid/grid_thermal_spectral.f90 +++ b/src/grid/grid_thermal_spectral.f90 @@ -110,7 +110,7 @@ subroutine grid_thermal_spectral_init() T_current = discretization_grid_getInitialCondition('T') T_lastInc = T_current T_stagInc = T_current - dotT_lastInc = 0.0_pReal + allocate(dotT_lastInc(size(T_current,1),size(T_current,2),size(T_current,3)), source=0.0_pReal) !-------------------------------------------------------------------------------------------------- ! initialize solver specific parts of PETSc From d315aac163dc94268b2f81afee1d31d4b1b70be2 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 15 Oct 2022 21:54:03 +0200 Subject: [PATCH 08/12] use sourced allocation --- src/grid/grid_thermal_spectral.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/grid/grid_thermal_spectral.f90 b/src/grid/grid_thermal_spectral.f90 index a63da30f1..6192420df 100644 --- a/src/grid/grid_thermal_spectral.f90 +++ b/src/grid/grid_thermal_spectral.f90 @@ -110,7 +110,7 @@ subroutine grid_thermal_spectral_init() T_current = discretization_grid_getInitialCondition('T') T_lastInc = T_current T_stagInc = T_current - allocate(dotT_lastInc(size(T_current,1),size(T_current,2),size(T_current,3)), source=0.0_pReal) + dotT_lastInc = 0.0_pReal * T_current !-------------------------------------------------------------------------------------------------- ! initialize solver specific parts of PETSc From bdb1e978902af804402346afe5dfbe703cb87ec4 Mon Sep 17 00:00:00 2001 From: Test User Date: Sun, 16 Oct 2022 13:32:07 +0200 Subject: [PATCH 09/12] [skip ci] updated version information after successful test of v3.0.0-alpha7-11-g11e91c0ef --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 8e3a5107b..932b826ff 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha7-7-gb2a600b07 +3.0.0-alpha7-11-g11e91c0ef From 53123d6c27032eb9de1e7b531c959601beaba049 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 16 Oct 2022 20:56:40 +0200 Subject: [PATCH 10/12] using current PRIVATE includes chances slightly less strict tolerance to avoid failing tests when using GCC and improved handling of output directory for commit history statistics --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 48a50a949..583beecdc 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 48a50a9494498c59ff4f4cdceb6d51e7068f9b6e +Subproject commit 583beecdcf806c5249574fd599f0b763f3461c3b From 57b69e20416f69c3b0bd02285c7042c037cfdd7b Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 17 Oct 2022 01:52:06 +0200 Subject: [PATCH 11/12] [skip ci] updated version information after successful test of v3.0.0-alpha7-13-g53123d6c2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 932b826ff..166737e58 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha7-11-g11e91c0ef +3.0.0-alpha7-13-g53123d6c2 From 51f0ac5d01aed21b092096e54d44f12c75457797 Mon Sep 17 00:00:00 2001 From: Test User Date: Wed, 19 Oct 2022 15:10:32 +0200 Subject: [PATCH 12/12] [skip ci] updated version information after successful test of v3.0.0-alpha7-16-g027d77e9f --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 166737e58..d9d5cd2fa 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha7-13-g53123d6c2 +3.0.0-alpha7-16-g027d77e9f