Merge branch 'development' into 39-simplify-obscure-numerics-integration-mode
This commit is contained in:
commit
0fa902100c
2
PRIVATE
2
PRIVATE
|
@ -1 +1 @@
|
||||||
Subproject commit 737427a967e098e1cc82f69f5447fd1a02ffa855
|
Subproject commit ce48785dcc5c9cae28cd35d45b612223c37c73b0
|
|
@ -19,7 +19,9 @@ if ( "x$DAMASK_NUM_THREADS" == "x" ) then
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# currently, there is no information that unlimited causes problems
|
# 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
|
# http://superuser.com/questions/220059/what-parameters-has-ulimit
|
||||||
limit datasize unlimited # maximum heap size (kB)
|
limit datasize unlimited # maximum heap size (kB)
|
||||||
limit stacksize unlimited # maximum stack size (kB)
|
limit stacksize unlimited # maximum stack size (kB)
|
||||||
|
|
|
@ -42,7 +42,9 @@ PROCESSING=$(type -p postResults || true 2>/dev/null)
|
||||||
[ "x$DAMASK_NUM_THREADS" == "x" ] && DAMASK_NUM_THREADS=1
|
[ "x$DAMASK_NUM_THREADS" == "x" ] && DAMASK_NUM_THREADS=1
|
||||||
|
|
||||||
# currently, there is no information that unlimited causes problems
|
# 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
|
# http://superuser.com/questions/220059/what-parameters-has-ulimit
|
||||||
ulimit -d unlimited 2>/dev/null # maximum heap size (kB)
|
ulimit -d unlimited 2>/dev/null # maximum heap size (kB)
|
||||||
ulimit -s unlimited 2>/dev/null # maximum stack size (kB)
|
ulimit -s unlimited 2>/dev/null # maximum stack size (kB)
|
||||||
|
|
|
@ -33,7 +33,9 @@ PROCESSING=$(which postResults || true 2>/dev/null)
|
||||||
[ "x$DAMASK_NUM_THREADS" = "x" ] && DAMASK_NUM_THREADS=1
|
[ "x$DAMASK_NUM_THREADS" = "x" ] && DAMASK_NUM_THREADS=1
|
||||||
|
|
||||||
# currently, there is no information that unlimited causes problems
|
# 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
|
# http://superuser.com/questions/220059/what-parameters-has-ulimit
|
||||||
ulimit -d unlimited 2>/dev/null # maximum heap size (kB)
|
ulimit -d unlimited 2>/dev/null # maximum heap size (kB)
|
||||||
ulimit -s unlimited 2>/dev/null # maximum stack size (kB)
|
ulimit -s unlimited 2>/dev/null # maximum stack size (kB)
|
||||||
|
|
|
@ -864,19 +864,11 @@ subroutine constitutive_collectDotState(Tstar_v, FeArray, FpArray, subdt, subfra
|
||||||
FpArray !< plastic deformation gradient
|
FpArray !< plastic deformation gradient
|
||||||
real(pReal), intent(in), dimension(6) :: &
|
real(pReal), intent(in), dimension(6) :: &
|
||||||
Tstar_v !< 2nd Piola Kirchhoff stress tensor (Mandel)
|
Tstar_v !< 2nd Piola Kirchhoff stress tensor (Mandel)
|
||||||
integer(pLongInt) :: &
|
|
||||||
tick = 0_pLongInt, &
|
|
||||||
tock = 0_pLongInt, &
|
|
||||||
tickrate, &
|
|
||||||
maxticks
|
|
||||||
integer(pInt) :: &
|
integer(pInt) :: &
|
||||||
ho, & !< homogenization
|
ho, & !< homogenization
|
||||||
tme, & !< thermal member position
|
tme, & !< thermal member position
|
||||||
s !< counter in source loop
|
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)
|
ho = material_homog( ip,el)
|
||||||
tme = thermalMapping(ho)%p(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
|
Fe !< elastic deformation gradient
|
||||||
integer(pInt) :: &
|
integer(pInt) :: &
|
||||||
s !< counter in source loop
|
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)))
|
plasticityType: select case (phase_plasticity(material_phase(ipc,ip,el)))
|
||||||
case (PLASTICITY_KINEHARDENING_ID) plasticityType
|
case (PLASTICITY_KINEHARDENING_ID) plasticityType
|
||||||
|
|
|
@ -93,7 +93,7 @@ module numerics
|
||||||
! spectral parameters:
|
! spectral parameters:
|
||||||
#ifdef Spectral
|
#ifdef Spectral
|
||||||
real(pReal), protected, public :: &
|
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_div_tolRel = 5.0e-4_pReal, & !< relative tolerance for equilibrium
|
||||||
err_curl_tolAbs = 1.0e-10_pReal, & !< absolute tolerance for compatibility
|
err_curl_tolAbs = 1.0e-10_pReal, & !< absolute tolerance for compatibility
|
||||||
err_curl_tolRel = 5.0e-4_pReal, & !< relative tolerance for compatibility
|
err_curl_tolRel = 5.0e-4_pReal, & !< relative tolerance for compatibility
|
||||||
|
|
|
@ -4,9 +4,8 @@
|
||||||
!> @brief Interfacing between the spectral solver and the material subroutines provided
|
!> @brief Interfacing between the spectral solver and the material subroutines provided
|
||||||
!! by DAMASK
|
!! by DAMASK
|
||||||
!> @details Interfacing between the spectral solver and the material subroutines provided
|
!> @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,
|
!> by DAMASK. Interpretating the command line arguments to get load case, geometry file,
|
||||||
!> the arguments parsed to the init routine to get load case, geometry file, working
|
!> and working directory.
|
||||||
!> directory, etc.
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
module DAMASK_interface
|
module DAMASK_interface
|
||||||
use prec, only: &
|
use prec, only: &
|
||||||
|
|
|
@ -65,8 +65,6 @@ subroutine spectral_thermal_init
|
||||||
compiler_options
|
compiler_options
|
||||||
#endif
|
#endif
|
||||||
use IO, only: &
|
use IO, only: &
|
||||||
IO_intOut, &
|
|
||||||
IO_read_realFile, &
|
|
||||||
IO_timeStamp
|
IO_timeStamp
|
||||||
use spectral_utilities, only: &
|
use spectral_utilities, only: &
|
||||||
wgt
|
wgt
|
||||||
|
|
Loading…
Reference in New Issue