From e6d5f1926fbab636eb3e62a3d1993d7f67e1368c Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 4 Aug 2018 14:35:57 +0200 Subject: [PATCH 1/9] issue of heap size still not finally resolved --- env/DAMASK.csh | 4 +++- env/DAMASK.sh | 4 +++- env/DAMASK.zsh | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/env/DAMASK.csh b/env/DAMASK.csh index 26e2dd8a2..07b4b6817 100644 --- a/env/DAMASK.csh +++ b/env/DAMASK.csh @@ -19,7 +19,9 @@ if ( "x$DAMASK_NUM_THREADS" == "x" ) then endif # currently, there is no information that unlimited causes problems -# still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it +# still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it +# more info https://jblevins.org/log/segfault +# https://stackoverflow.com/questions/79923/what-and-where-are-the-stack-and-heap # http://superuser.com/questions/220059/what-parameters-has-ulimit limit datasize unlimited # maximum heap size (kB) limit stacksize unlimited # maximum stack size (kB) diff --git a/env/DAMASK.sh b/env/DAMASK.sh index 509f5f1b7..663e9a4b3 100644 --- a/env/DAMASK.sh +++ b/env/DAMASK.sh @@ -42,7 +42,9 @@ PROCESSING=$(type -p postResults || true 2>/dev/null) [ "x$DAMASK_NUM_THREADS" == "x" ] && DAMASK_NUM_THREADS=1 # currently, there is no information that unlimited causes problems -# still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it +# still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it +# more info https://jblevins.org/log/segfault +# https://stackoverflow.com/questions/79923/what-and-where-are-the-stack-and-heap # http://superuser.com/questions/220059/what-parameters-has-ulimit ulimit -d unlimited 2>/dev/null # maximum heap size (kB) ulimit -s unlimited 2>/dev/null # maximum stack size (kB) diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh index 3ceeb116a..43f682865 100644 --- a/env/DAMASK.zsh +++ b/env/DAMASK.zsh @@ -33,7 +33,9 @@ PROCESSING=$(which postResults || true 2>/dev/null) [ "x$DAMASK_NUM_THREADS" = "x" ] && DAMASK_NUM_THREADS=1 # currently, there is no information that unlimited causes problems -# still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it +# still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it +# more info https://jblevins.org/log/segfault +# https://stackoverflow.com/questions/79923/what-and-where-are-the-stack-and-heap # http://superuser.com/questions/220059/what-parameters-has-ulimit ulimit -d unlimited 2>/dev/null # maximum heap size (kB) ulimit -s unlimited 2>/dev/null # maximum stack size (kB) From 60fc47ca2a41bc135ebca48a724e4a840fc4cfae Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 5 Aug 2018 09:41:27 +0200 Subject: [PATCH 2/9] unused import --- src/spectral_thermal.f90 | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/spectral_thermal.f90 b/src/spectral_thermal.f90 index 8e5b95ab9..4275c9533 100644 --- a/src/spectral_thermal.f90 +++ b/src/spectral_thermal.f90 @@ -65,8 +65,6 @@ subroutine spectral_thermal_init compiler_options #endif use IO, only: & - IO_intOut, & - IO_read_realFile, & IO_timeStamp use spectral_utilities, only: & wgt From c0adb613504586adec9252f3796f285612eb8058 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 5 Aug 2018 10:41:01 +0200 Subject: [PATCH 3/9] outdated description --- src/spectral_interface.f90 | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/spectral_interface.f90 b/src/spectral_interface.f90 index 1ab92a178..c3cb9141b 100644 --- a/src/spectral_interface.f90 +++ b/src/spectral_interface.f90 @@ -4,9 +4,8 @@ !> @brief Interfacing between the spectral solver and the material subroutines provided !! by DAMASK !> @details Interfacing between the spectral solver and the material subroutines provided -!> by DAMASK. Interpretating the command line arguments or, in case of called from f2py, -!> the arguments parsed to the init routine to get load case, geometry file, working -!> directory, etc. +!> by DAMASK. Interpretating the command line arguments to get load case, geometry file, +!> and working directory. !-------------------------------------------------------------------------------------------------- module DAMASK_interface use prec, only: & From 5337fb1229baab5e6a5e18fc3daf2ee0a138981f Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sun, 5 Aug 2018 11:08:17 +0200 Subject: [PATCH 4/9] old runtime debugging leftovers --- src/constitutive.f90 | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/src/constitutive.f90 b/src/constitutive.f90 index 9c3989a9c..7833f70cf 100644 --- a/src/constitutive.f90 +++ b/src/constitutive.f90 @@ -864,19 +864,11 @@ subroutine constitutive_collectDotState(Tstar_v, FeArray, FpArray, subdt, subfra FpArray !< plastic deformation gradient real(pReal), intent(in), dimension(6) :: & Tstar_v !< 2nd Piola Kirchhoff stress tensor (Mandel) - integer(pLongInt) :: & - tick = 0_pLongInt, & - tock = 0_pLongInt, & - tickrate, & - maxticks integer(pInt) :: & ho, & !< homogenization tme, & !< thermal member position s !< counter in source loop - if (iand(debug_level(debug_constitutive), debug_levelBasic) /= 0_pInt) & - call system_clock(count=tick,count_rate=tickrate,count_max=maxticks) - ho = material_homog( ip,el) tme = thermalMapping(ho)%p(ip,el) @@ -957,13 +949,6 @@ subroutine constitutive_collectDeltaState(Tstar_v, Fe, ipc, ip, el) Fe !< elastic deformation gradient integer(pInt) :: & s !< counter in source loop - integer(pLongInt) :: & - tick, tock, & - tickrate, & - maxticks - - if (iand(debug_level(debug_constitutive), debug_levelBasic) /= 0_pInt) & - call system_clock(count=tick,count_rate=tickrate,count_max=maxticks) plasticityType: select case (phase_plasticity(material_phase(ipc,ip,el))) case (PLASTICITY_KINEHARDENING_ID) plasticityType From 615af684eb7c2a948b6632fb9b80963a867b2800 Mon Sep 17 00:00:00 2001 From: Test User Date: Mon, 20 Aug 2018 08:55:59 +0200 Subject: [PATCH 5/9] [skip ci] updated version information after successful test of v2.0.2-381-gc03ea8f5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 943cac93c..fea0a6cd0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-374-g3e4f6598 +v2.0.2-381-gc03ea8f5 From 7c683d4f3d49b38a337fcb85c97abd55a57be20b Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Mon, 20 Aug 2018 09:02:03 +0200 Subject: [PATCH 6/9] updated tests for 38- and 36- branches --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 737427a96..c44717258 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 737427a967e098e1cc82f69f5447fd1a02ffa855 +Subproject commit c4471725893e301044924eb0990e2ad619aa0a46 From 87a8a9536ba0fc9dd9f084df8fe7e1a358f30277 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Mon, 20 Aug 2018 16:34:43 -0400 Subject: [PATCH 7/9] absTol for divergence was way too tight --- src/numerics.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/numerics.f90 b/src/numerics.f90 index 56da2041e..6866a89ad 100644 --- a/src/numerics.f90 +++ b/src/numerics.f90 @@ -94,7 +94,7 @@ module numerics ! spectral parameters: #ifdef Spectral real(pReal), protected, public :: & - err_div_tolAbs = 1.0e-10_pReal, & !< absolute tolerance for equilibrium + err_div_tolAbs = 1.0e-4_pReal, & !< absolute tolerance for equilibrium err_div_tolRel = 5.0e-4_pReal, & !< relative tolerance for equilibrium err_curl_tolAbs = 1.0e-10_pReal, & !< absolute tolerance for compatibility err_curl_tolRel = 5.0e-4_pReal, & !< relative tolerance for compatibility From c6ed69cb77426620d721ce87600a6f0c53d5b418 Mon Sep 17 00:00:00 2001 From: Test User Date: Tue, 21 Aug 2018 09:47:03 +0200 Subject: [PATCH 8/9] [skip ci] updated version information after successful test of v2.0.2-390-g7c683d4f --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fea0a6cd0..0f2fd848d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-381-gc03ea8f5 +v2.0.2-390-g7c683d4f From 51dbc6c445c59c20b1f3b8f82fc308ead4c97c2a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 21 Aug 2018 22:58:54 +0200 Subject: [PATCH 9/9] test compatible with 39-branch --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index c44717258..ce48785dc 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit c4471725893e301044924eb0990e2ad619aa0a46 +Subproject commit ce48785dcc5c9cae28cd35d45b612223c37c73b0