Merge branch '21_removeperformanceprofiling' into 'development'
21 removeperformanceprofiling See merge request damask/DAMASK!29
This commit is contained in:
commit
cb71e9401b
|
@ -803,8 +803,6 @@ subroutine constitutive_collectDotState(Tstar_v, FeArray, FpArray, subdt, subfra
|
||||||
pReal, &
|
pReal, &
|
||||||
pLongInt
|
pLongInt
|
||||||
use debug, only: &
|
use debug, only: &
|
||||||
debug_cumDotStateCalls, &
|
|
||||||
debug_cumDotStateTicks, &
|
|
||||||
debug_level, &
|
debug_level, &
|
||||||
debug_constitutive, &
|
debug_constitutive, &
|
||||||
debug_levelBasic
|
debug_levelBasic
|
||||||
|
@ -913,15 +911,6 @@ subroutine constitutive_collectDotState(Tstar_v, FeArray, FpArray, subdt, subfra
|
||||||
end select sourceType
|
end select sourceType
|
||||||
enddo SourceLoop
|
enddo SourceLoop
|
||||||
|
|
||||||
if (iand(debug_level(debug_constitutive), debug_levelBasic) /= 0_pInt) then
|
|
||||||
call system_clock(count=tock,count_rate=tickrate,count_max=maxticks)
|
|
||||||
!$OMP CRITICAL (debugTimingDotState)
|
|
||||||
debug_cumDotStateCalls = debug_cumDotStateCalls + 1_pInt
|
|
||||||
debug_cumDotStateTicks = debug_cumDotStateTicks + tock-tick
|
|
||||||
!$OMP FLUSH (debug_cumDotStateTicks)
|
|
||||||
if (tock < tick) debug_cumDotStateTicks = debug_cumDotStateTicks + maxticks
|
|
||||||
!$OMP END CRITICAL (debugTimingDotState)
|
|
||||||
endif
|
|
||||||
end subroutine constitutive_collectDotState
|
end subroutine constitutive_collectDotState
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
|
@ -933,8 +922,6 @@ subroutine constitutive_collectDeltaState(Tstar_v, Fe, ipc, ip, el)
|
||||||
pReal, &
|
pReal, &
|
||||||
pLongInt
|
pLongInt
|
||||||
use debug, only: &
|
use debug, only: &
|
||||||
debug_cumDeltaStateCalls, &
|
|
||||||
debug_cumDeltaStateTicks, &
|
|
||||||
debug_level, &
|
debug_level, &
|
||||||
debug_constitutive, &
|
debug_constitutive, &
|
||||||
debug_levelBasic
|
debug_levelBasic
|
||||||
|
@ -997,16 +984,6 @@ subroutine constitutive_collectDeltaState(Tstar_v, Fe, ipc, ip, el)
|
||||||
end select sourceType
|
end select sourceType
|
||||||
enddo SourceLoop
|
enddo SourceLoop
|
||||||
|
|
||||||
if (iand(debug_level(debug_constitutive), debug_levelBasic) /= 0_pInt) then
|
|
||||||
call system_clock(count=tock,count_rate=tickrate,count_max=maxticks)
|
|
||||||
!$OMP CRITICAL (debugTimingDeltaState)
|
|
||||||
debug_cumDeltaStateCalls = debug_cumDeltaStateCalls + 1_pInt
|
|
||||||
debug_cumDeltaStateTicks = debug_cumDeltaStateTicks + tock-tick
|
|
||||||
!$OMP FLUSH (debug_cumDeltaStateTicks)
|
|
||||||
if (tock < tick) debug_cumDeltaStateTicks = debug_cumDeltaStateTicks + maxticks
|
|
||||||
!$OMP END CRITICAL (debugTimingDeltaState)
|
|
||||||
endif
|
|
||||||
|
|
||||||
end subroutine constitutive_collectDeltaState
|
end subroutine constitutive_collectDeltaState
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -506,8 +506,7 @@ subroutine crystallite_stressAndItsTangent(updateJaco)
|
||||||
debug_levelSelective, &
|
debug_levelSelective, &
|
||||||
debug_e, &
|
debug_e, &
|
||||||
debug_i, &
|
debug_i, &
|
||||||
debug_g, &
|
debug_g
|
||||||
debug_CrystalliteLoopDistribution
|
|
||||||
use IO, only: &
|
use IO, only: &
|
||||||
IO_warning, &
|
IO_warning, &
|
||||||
IO_error
|
IO_error
|
||||||
|
@ -922,13 +921,6 @@ subroutine crystallite_stressAndItsTangent(updateJaco)
|
||||||
else ! this crystallite just converged for the entire timestep
|
else ! this crystallite just converged for the entire timestep
|
||||||
crystallite_todo(c,i,e) = .false. ! so done here
|
crystallite_todo(c,i,e) = .false. ! so done here
|
||||||
!$OMP FLUSH(crystallite_todo)
|
!$OMP FLUSH(crystallite_todo)
|
||||||
if (iand(debug_level(debug_crystallite),debug_levelBasic) /= 0_pInt &
|
|
||||||
.and. formerSubStep > 0.0_pReal) then
|
|
||||||
!$OMP CRITICAL (distributionCrystallite)
|
|
||||||
debug_CrystalliteLoopDistribution(min(nCryst+1_pInt,NiterationCrystallite)) = &
|
|
||||||
debug_CrystalliteLoopDistribution(min(nCryst+1_pInt,NiterationCrystallite)) + 1_pInt
|
|
||||||
!$OMP END CRITICAL (distributionCrystallite)
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
! --- cutback ---
|
! --- cutback ---
|
||||||
|
@ -1235,8 +1227,7 @@ subroutine crystallite_integrateStateRK4()
|
||||||
debug_crystallite, &
|
debug_crystallite, &
|
||||||
debug_levelBasic, &
|
debug_levelBasic, &
|
||||||
debug_levelExtensive, &
|
debug_levelExtensive, &
|
||||||
debug_levelSelective, &
|
debug_levelSelective
|
||||||
debug_StateLoopDistribution
|
|
||||||
use FEsolving, only: &
|
use FEsolving, only: &
|
||||||
FEsolving_execElem, &
|
FEsolving_execElem, &
|
||||||
FEsolving_execIP
|
FEsolving_execIP
|
||||||
|
@ -1492,15 +1483,7 @@ subroutine crystallite_integrateStateRK4()
|
||||||
! --- SET CONVERGENCE FLAG ---
|
! --- SET CONVERGENCE FLAG ---
|
||||||
|
|
||||||
do e = eIter(1),eIter(2); do i = iIter(1,e),iIter(2,e); do g = gIter(1,e),gIter(2,e) ! iterate over elements, ips and grains
|
do e = eIter(1),eIter(2); do i = iIter(1,e),iIter(2,e); do g = gIter(1,e),gIter(2,e) ! iterate over elements, ips and grains
|
||||||
if (crystallite_todo(g,i,e)) then
|
crystallite_converged(g,i,e) = crystallite_todo(g,i,e) .or. crystallite_converged(g,i,e) ! if still "to do" then converged per definitionem
|
||||||
crystallite_converged(g,i,e) = .true. ! if still "to do" then converged per definitionem
|
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then
|
|
||||||
!$OMP CRITICAL (distributionState)
|
|
||||||
debug_StateLoopDistribution(4,numerics_integrationMode) = &
|
|
||||||
debug_StateLoopDistribution(4,numerics_integrationMode) + 1_pInt
|
|
||||||
!$OMP END CRITICAL (distributionState)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
enddo; enddo; enddo
|
enddo; enddo; enddo
|
||||||
|
|
||||||
|
|
||||||
|
@ -1532,8 +1515,7 @@ subroutine crystallite_integrateStateRKCK45()
|
||||||
debug_crystallite, &
|
debug_crystallite, &
|
||||||
debug_levelBasic, &
|
debug_levelBasic, &
|
||||||
debug_levelExtensive, &
|
debug_levelExtensive, &
|
||||||
debug_levelSelective, &
|
debug_levelSelective
|
||||||
debug_StateLoopDistribution
|
|
||||||
use numerics, only: &
|
use numerics, only: &
|
||||||
rTol_crystalliteState, &
|
rTol_crystalliteState, &
|
||||||
numerics_integrationMode
|
numerics_integrationMode
|
||||||
|
@ -1996,15 +1978,7 @@ subroutine crystallite_integrateStateRKCK45()
|
||||||
! --- SET CONVERGENCE FLAG ---
|
! --- SET CONVERGENCE FLAG ---
|
||||||
!$OMP DO
|
!$OMP DO
|
||||||
do e = eIter(1),eIter(2); do i = iIter(1,e),iIter(2,e); do g = gIter(1,e),gIter(2,e) ! iterate over elements, ips and grains
|
do e = eIter(1),eIter(2); do i = iIter(1,e),iIter(2,e); do g = gIter(1,e),gIter(2,e) ! iterate over elements, ips and grains
|
||||||
if (crystallite_todo(g,i,e)) then
|
crystallite_converged(g,i,e) = crystallite_todo(g,i,e) .or. crystallite_converged(g,i,e) ! if still "to do" then converged per definition
|
||||||
crystallite_converged(g,i,e) = .true. ! if still "to do" then converged per definition
|
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then
|
|
||||||
!$OMP CRITICAL (distributionState)
|
|
||||||
debug_StateLoopDistribution(6,numerics_integrationMode) = &
|
|
||||||
debug_StateLoopDistribution(6,numerics_integrationMode) + 1_pInt
|
|
||||||
!$OMP END CRITICAL (distributionState)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
enddo; enddo; enddo
|
enddo; enddo; enddo
|
||||||
!$OMP ENDDO
|
!$OMP ENDDO
|
||||||
|
|
||||||
|
@ -2037,8 +2011,7 @@ subroutine crystallite_integrateStateAdaptiveEuler()
|
||||||
debug_crystallite, &
|
debug_crystallite, &
|
||||||
debug_levelBasic, &
|
debug_levelBasic, &
|
||||||
debug_levelExtensive, &
|
debug_levelExtensive, &
|
||||||
debug_levelSelective, &
|
debug_levelSelective
|
||||||
debug_StateLoopDistribution
|
|
||||||
use numerics, only: &
|
use numerics, only: &
|
||||||
rTol_crystalliteState, &
|
rTol_crystalliteState, &
|
||||||
numerics_integrationMode
|
numerics_integrationMode
|
||||||
|
@ -2342,8 +2315,6 @@ subroutine crystallite_integrateStateAdaptiveEuler()
|
||||||
crystallite_converged(g,i,e) = .true. ! ... converged per definitionem
|
crystallite_converged(g,i,e) = .true. ! ... converged per definitionem
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then
|
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then
|
||||||
!$OMP CRITICAL (distributionState)
|
!$OMP CRITICAL (distributionState)
|
||||||
debug_StateLoopDistribution(2,numerics_integrationMode) = &
|
|
||||||
debug_StateLoopDistribution(2,numerics_integrationMode) + 1_pInt
|
|
||||||
!$OMP END CRITICAL (distributionState)
|
!$OMP END CRITICAL (distributionState)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
@ -2356,15 +2327,7 @@ subroutine crystallite_integrateStateAdaptiveEuler()
|
||||||
|
|
||||||
!$OMP PARALLEL DO
|
!$OMP PARALLEL DO
|
||||||
do e = eIter(1),eIter(2); do i = iIter(1,e),iIter(2,e); do g = gIter(1,e),gIter(2,e) ! iterate over elements, ips and grains
|
do e = eIter(1),eIter(2); do i = iIter(1,e),iIter(2,e); do g = gIter(1,e),gIter(2,e) ! iterate over elements, ips and grains
|
||||||
if (crystallite_todo(g,i,e)) then
|
crystallite_converged(g,i,e) = crystallite_todo(g,i,e) .or. crystallite_converged(g,i,e) ! ... converged per definitionem
|
||||||
crystallite_converged(g,i,e) = .true. ! ... converged per definitionem
|
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then
|
|
||||||
!$OMP CRITICAL (distributionState)
|
|
||||||
debug_StateLoopDistribution(2,numerics_integrationMode) = &
|
|
||||||
debug_StateLoopDistribution(2,numerics_integrationMode) + 1_pInt
|
|
||||||
!$OMP END CRITICAL (distributionState)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
enddo; enddo; enddo
|
enddo; enddo; enddo
|
||||||
!$OMP END PARALLEL DO
|
!$OMP END PARALLEL DO
|
||||||
|
|
||||||
|
@ -2399,8 +2362,7 @@ subroutine crystallite_integrateStateEuler()
|
||||||
debug_crystallite, &
|
debug_crystallite, &
|
||||||
debug_levelBasic, &
|
debug_levelBasic, &
|
||||||
debug_levelExtensive, &
|
debug_levelExtensive, &
|
||||||
debug_levelSelective, &
|
debug_levelSelective
|
||||||
debug_StateLoopDistribution
|
|
||||||
use numerics, only: &
|
use numerics, only: &
|
||||||
numerics_integrationMode, &
|
numerics_integrationMode, &
|
||||||
numerics_timeSyncing
|
numerics_timeSyncing
|
||||||
|
@ -2581,15 +2543,7 @@ eIter = FEsolving_execElem(1:2)
|
||||||
|
|
||||||
!$OMP DO
|
!$OMP DO
|
||||||
do e = eIter(1),eIter(2); do i = iIter(1,e),iIter(2,e); do g = gIter(1,e),gIter(2,e) ! iterate over elements, ips and grains
|
do e = eIter(1),eIter(2); do i = iIter(1,e),iIter(2,e); do g = gIter(1,e),gIter(2,e) ! iterate over elements, ips and grains
|
||||||
if (crystallite_todo(g,i,e) .and. .not. crystallite_converged(g,i,e)) then
|
crystallite_converged(g,i,e) = crystallite_todo(g,i,e) .or. crystallite_converged(g,i,e) ! if still "to do" then converged per definitionem
|
||||||
crystallite_converged(g,i,e) = .true. ! if still "to do" then converged per definitionem
|
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then
|
|
||||||
!$OMP CRITICAL (distributionState)
|
|
||||||
debug_StateLoopDistribution(1,numerics_integrationMode) = &
|
|
||||||
debug_StateLoopDistribution(1,numerics_integrationMode) + 1_pInt
|
|
||||||
!$OMP END CRITICAL (distributionState)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
enddo; enddo; enddo
|
enddo; enddo; enddo
|
||||||
!$OMP ENDDO
|
!$OMP ENDDO
|
||||||
|
|
||||||
|
@ -2624,8 +2578,7 @@ subroutine crystallite_integrateStateFPI()
|
||||||
debug_crystallite, &
|
debug_crystallite, &
|
||||||
debug_levelBasic, &
|
debug_levelBasic, &
|
||||||
debug_levelExtensive, &
|
debug_levelExtensive, &
|
||||||
debug_levelSelective, &
|
debug_levelSelective
|
||||||
debug_StateLoopDistribution
|
|
||||||
use numerics, only: &
|
use numerics, only: &
|
||||||
nState, &
|
nState, &
|
||||||
numerics_integrationMode, &
|
numerics_integrationMode, &
|
||||||
|
@ -2997,16 +2950,8 @@ subroutine crystallite_integrateStateFPI()
|
||||||
.or. abs(sourceStateResiduum(1:mySizeSourceDotState,mySource)) < &
|
.or. abs(sourceStateResiduum(1:mySizeSourceDotState,mySource)) < &
|
||||||
rTol_crystalliteState * abs(tempSourceState(1:mySizeSourceDotState,mySource)))
|
rTol_crystalliteState * abs(tempSourceState(1:mySizeSourceDotState,mySource)))
|
||||||
enddo
|
enddo
|
||||||
if (converged) then
|
if (converged) crystallite_converged(g,i,e) = .true. ! ... converged per definition
|
||||||
crystallite_converged(g,i,e) = .true. ! ... converged per definition
|
|
||||||
|
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then
|
|
||||||
!$OMP CRITICAL (distributionState)
|
|
||||||
debug_StateLoopDistribution(NiterationState,numerics_integrationMode) = &
|
|
||||||
debug_StateLoopDistribution(NiterationState,numerics_integrationMode) + 1_pInt
|
|
||||||
!$OMP END CRITICAL (distributionState)
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
plasticState(p)%state(1:mySizePlasticDotState,c) = &
|
plasticState(p)%state(1:mySizePlasticDotState,c) = &
|
||||||
tempPlasticState(1:mySizePlasticDotState)
|
tempPlasticState(1:mySizePlasticDotState)
|
||||||
do mySource = 1_pInt, phase_Nsources(p)
|
do mySource = 1_pInt, phase_Nsources(p)
|
||||||
|
@ -3215,19 +3160,16 @@ logical function crystallite_integrateStress(&
|
||||||
subStepSizeLp, &
|
subStepSizeLp, &
|
||||||
subStepSizeLi
|
subStepSizeLi
|
||||||
use debug, only: debug_level, &
|
use debug, only: debug_level, &
|
||||||
debug_crystallite, &
|
|
||||||
debug_levelBasic, &
|
|
||||||
debug_levelExtensive, &
|
|
||||||
debug_levelSelective, &
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
debug_e, &
|
debug_e, &
|
||||||
debug_i, &
|
debug_i, &
|
||||||
debug_g, &
|
debug_g, &
|
||||||
#endif
|
#endif
|
||||||
debug_cumLpCalls, &
|
debug_crystallite, &
|
||||||
debug_cumLpTicks, &
|
debug_levelBasic, &
|
||||||
debug_StressLoopLpDistribution, &
|
debug_levelExtensive, &
|
||||||
debug_StressLoopLiDistribution
|
debug_levelSelective
|
||||||
|
|
||||||
use constitutive, only: constitutive_LpAndItsTangent, &
|
use constitutive, only: constitutive_LpAndItsTangent, &
|
||||||
constitutive_LiAndItsTangent, &
|
constitutive_LiAndItsTangent, &
|
||||||
constitutive_TandItsTangent
|
constitutive_TandItsTangent
|
||||||
|
@ -3328,7 +3270,7 @@ logical function crystallite_integrateStress(&
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelExtensive) /= 0_pInt &
|
if (iand(debug_level(debug_crystallite), debug_levelExtensive) /= 0_pInt &
|
||||||
.and. ((el == debug_e .and. ip == debug_i .and. ipc == debug_g) &
|
.and. ((el == debug_e .and. ip == debug_i .and. ipc == debug_g) &
|
||||||
.or. .not. iand(debug_level(debug_crystallite), debug_levelSelective) /= 0_pInt)) &
|
.or. .not. iand(debug_level(debug_crystallite), debug_levelSelective) /= 0_pInt)) &
|
||||||
write(6,'(a,i8,1x,i2,1x,i3)') '<< CRYST >> integrateStress at el ip ipc ',el,ip,ipc
|
write(6,'(a,i8,1x,i2,1x,i3)') '<< CRYST >> integrateStress at el ip ipc ',el,ip,ipc
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
!* only integrate over fraction of timestep?
|
!* only integrate over fraction of timestep?
|
||||||
|
@ -3432,9 +3374,6 @@ logical function crystallite_integrateStress(&
|
||||||
|
|
||||||
!* calculate plastic velocity gradient and its tangent from constitutive law
|
!* calculate plastic velocity gradient and its tangent from constitutive law
|
||||||
|
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) &
|
|
||||||
call system_clock(count=tick,count_rate=tickrate,count_max=maxticks)
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelExtensive) /= 0_pInt &
|
if (iand(debug_level(debug_crystallite), debug_levelExtensive) /= 0_pInt &
|
||||||
.and. ((el == debug_e .and. ip == debug_i .and. ipc == debug_g) &
|
.and. ((el == debug_e .and. ip == debug_i .and. ipc == debug_g) &
|
||||||
|
@ -3449,16 +3388,6 @@ logical function crystallite_integrateStress(&
|
||||||
call constitutive_LpAndItsTangent(Lp_constitutive, dLp_dT3333, dLp_dFi3333, &
|
call constitutive_LpAndItsTangent(Lp_constitutive, dLp_dT3333, dLp_dFi3333, &
|
||||||
Tstar_v, Fi_new, ipc, ip, el)
|
Tstar_v, Fi_new, ipc, ip, el)
|
||||||
|
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then
|
|
||||||
call system_clock(count=tock,count_rate=tickrate,count_max=maxticks)
|
|
||||||
!$OMP CRITICAL (debugTimingLpTangent)
|
|
||||||
debug_cumLpCalls = debug_cumLpCalls + 1_pInt
|
|
||||||
debug_cumLpTicks = debug_cumLpTicks + tock-tick
|
|
||||||
!$OMP FLUSH (debug_cumLpTicks)
|
|
||||||
if (tock < tick) debug_cumLpTicks = debug_cumLpTicks + maxticks
|
|
||||||
!$OMP END CRITICAL (debugTimingLpTangent)
|
|
||||||
endif
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelExtensive) /= 0_pInt &
|
if (iand(debug_level(debug_crystallite), debug_levelExtensive) /= 0_pInt &
|
||||||
.and. ((el == debug_e .and. ip == debug_i .and. ipc == debug_g) &
|
.and. ((el == debug_e .and. ip == debug_i .and. ipc == debug_g) &
|
||||||
|
@ -3556,13 +3485,6 @@ logical function crystallite_integrateStress(&
|
||||||
|
|
||||||
enddo LpLoop
|
enddo LpLoop
|
||||||
|
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then
|
|
||||||
!$OMP CRITICAL (distributionStress)
|
|
||||||
debug_StressLoopLpDistribution(NiterationStressLp,numerics_integrationMode) = &
|
|
||||||
debug_StressLoopLpDistribution(NiterationStressLp,numerics_integrationMode) + 1_pInt
|
|
||||||
!$OMP END CRITICAL (distributionStress)
|
|
||||||
endif
|
|
||||||
|
|
||||||
!* calculate intermediate velocity gradient and its tangent from constitutive law
|
!* calculate intermediate velocity gradient and its tangent from constitutive law
|
||||||
|
|
||||||
call constitutive_LiAndItsTangent(Li_constitutive, dLi_dT3333, dLi_dFi3333, &
|
call constitutive_LiAndItsTangent(Li_constitutive, dLi_dT3333, dLi_dFi3333, &
|
||||||
|
@ -3643,13 +3565,6 @@ logical function crystallite_integrateStress(&
|
||||||
Liguess = Liguess + steplengthLi * deltaLi
|
Liguess = Liguess + steplengthLi * deltaLi
|
||||||
enddo LiLoop
|
enddo LiLoop
|
||||||
|
|
||||||
if (iand(debug_level(debug_crystallite), debug_levelBasic) /= 0_pInt) then
|
|
||||||
!$OMP CRITICAL (distributionStress)
|
|
||||||
debug_StressLoopLiDistribution(NiterationStressLi,numerics_integrationMode) = &
|
|
||||||
debug_StressLoopLiDistribution(NiterationStressLi,numerics_integrationMode) + 1_pInt
|
|
||||||
!$OMP END CRITICAL (distributionStress)
|
|
||||||
endif
|
|
||||||
|
|
||||||
!* calculate new plastic and elastic deformation gradient
|
!* calculate new plastic and elastic deformation gradient
|
||||||
|
|
||||||
invFp_new = math_mul33x33(invFp_current,B)
|
invFp_new = math_mul33x33(invFp_current,B)
|
||||||
|
|
157
src/debug.f90
157
src/debug.f90
|
@ -46,21 +46,11 @@ module debug
|
||||||
integer(pInt),protected, dimension(debug_maxNtype+2_pInt), public :: & ! specific ones, and 2 for "all" and "other"
|
integer(pInt),protected, dimension(debug_maxNtype+2_pInt), public :: & ! specific ones, and 2 for "all" and "other"
|
||||||
debug_level = 0_pInt
|
debug_level = 0_pInt
|
||||||
|
|
||||||
integer(pLongInt), public :: &
|
|
||||||
debug_cumLpCalls = 0_pLongInt, & !< total number of calls to LpAndItsTangent
|
|
||||||
debug_cumDeltaStateCalls = 0_pLongInt, & !< total number of calls to deltaState
|
|
||||||
debug_cumDotStateCalls = 0_pLongInt !< total number of calls to dotState
|
|
||||||
|
|
||||||
integer(pInt), protected, public :: &
|
integer(pInt), protected, public :: &
|
||||||
debug_e = 1_pInt, &
|
debug_e = 1_pInt, &
|
||||||
debug_i = 1_pInt, &
|
debug_i = 1_pInt, &
|
||||||
debug_g = 1_pInt
|
debug_g = 1_pInt
|
||||||
|
|
||||||
integer(pLongInt), public :: &
|
|
||||||
debug_cumLpTicks = 0_pLongInt, & !< total cpu ticks spent in LpAndItsTangent
|
|
||||||
debug_cumDeltaStateTicks = 0_pLongInt, & !< total cpu ticks spent in deltaState
|
|
||||||
debug_cumDotStateTicks = 0_pLongInt !< total cpu ticks spent in dotState
|
|
||||||
|
|
||||||
integer(pInt), dimension(2), public :: &
|
integer(pInt), dimension(2), public :: &
|
||||||
debug_stressMaxLocation = 0_pInt, &
|
debug_stressMaxLocation = 0_pInt, &
|
||||||
debug_stressMinLocation = 0_pInt, &
|
debug_stressMinLocation = 0_pInt, &
|
||||||
|
@ -68,16 +58,6 @@ module debug
|
||||||
debug_jacobianMinLocation = 0_pInt
|
debug_jacobianMinLocation = 0_pInt
|
||||||
|
|
||||||
|
|
||||||
integer(pInt), dimension(:), allocatable, public :: &
|
|
||||||
debug_CrystalliteLoopDistribution, & !< distribution of crystallite cutbacks
|
|
||||||
debug_MaterialpointStateLoopDistribution, &
|
|
||||||
debug_MaterialpointLoopDistribution
|
|
||||||
|
|
||||||
integer(pInt), dimension(:,:), allocatable, public :: &
|
|
||||||
debug_StressLoopLiDistribution, & !< distribution of stress iterations until convergence
|
|
||||||
debug_StressLoopLpDistribution, & !< distribution of stress iterations until convergence
|
|
||||||
debug_StateLoopDistribution !< distribution of state iterations until convergence
|
|
||||||
|
|
||||||
real(pReal), public :: &
|
real(pReal), public :: &
|
||||||
debug_stressMax = -huge(1.0_pReal), &
|
debug_stressMax = -huge(1.0_pReal), &
|
||||||
debug_stressMin = huge(1.0_pReal), &
|
debug_stressMin = huge(1.0_pReal), &
|
||||||
|
@ -107,12 +87,7 @@ subroutine debug_init
|
||||||
compiler_version, &
|
compiler_version, &
|
||||||
compiler_options
|
compiler_options
|
||||||
#endif
|
#endif
|
||||||
use numerics, only: &
|
|
||||||
nStress, &
|
|
||||||
nState, &
|
|
||||||
nCryst, &
|
|
||||||
nMPstate, &
|
|
||||||
nHomog
|
|
||||||
use IO, only: &
|
use IO, only: &
|
||||||
IO_read, &
|
IO_read, &
|
||||||
IO_error, &
|
IO_error, &
|
||||||
|
@ -137,13 +112,6 @@ subroutine debug_init
|
||||||
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
|
write(6,'(a15,a)') ' Current time: ',IO_timeStamp()
|
||||||
#include "compilation_info.f90"
|
#include "compilation_info.f90"
|
||||||
|
|
||||||
allocate(debug_StressLoopLpDistribution(nStress+1,2), source=0_pInt)
|
|
||||||
allocate(debug_StressLoopLiDistribution(nStress+1,2), source=0_pInt)
|
|
||||||
allocate(debug_StateLoopDistribution(nState+1,2), source=0_pInt)
|
|
||||||
allocate(debug_CrystalliteLoopDistribution(nCryst+1), source=0_pInt)
|
|
||||||
allocate(debug_MaterialpointStateLoopDistribution(nMPstate), source=0_pInt)
|
|
||||||
allocate(debug_MaterialpointLoopDistribution(nHomog+1), source=0_pInt)
|
|
||||||
|
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
! try to open the config file
|
! try to open the config file
|
||||||
|
|
||||||
|
@ -297,18 +265,6 @@ subroutine debug_reset
|
||||||
|
|
||||||
implicit none
|
implicit none
|
||||||
|
|
||||||
debug_StressLoopLpDistribution = 0_pInt
|
|
||||||
debug_StressLoopLiDistribution = 0_pInt
|
|
||||||
debug_StateLoopDistribution = 0_pInt
|
|
||||||
debug_CrystalliteLoopDistribution = 0_pInt
|
|
||||||
debug_MaterialpointStateLoopDistribution = 0_pInt
|
|
||||||
debug_MaterialpointLoopDistribution = 0_pInt
|
|
||||||
debug_cumLpTicks = 0_pLongInt
|
|
||||||
debug_cumDeltaStateTicks = 0_pLongInt
|
|
||||||
debug_cumDotStateTicks = 0_pLongInt
|
|
||||||
debug_cumLpCalls = 0_pInt
|
|
||||||
debug_cumDeltaStateCalls = 0_pInt
|
|
||||||
debug_cumDotStateCalls = 0_pInt
|
|
||||||
debug_stressMaxLocation = 0_pInt
|
debug_stressMaxLocation = 0_pInt
|
||||||
debug_stressMinLocation = 0_pInt
|
debug_stressMinLocation = 0_pInt
|
||||||
debug_jacobianMaxLocation = 0_pInt
|
debug_jacobianMaxLocation = 0_pInt
|
||||||
|
@ -325,123 +281,12 @@ end subroutine debug_reset
|
||||||
!> @brief writes debug statements to standard out
|
!> @brief writes debug statements to standard out
|
||||||
!--------------------------------------------------------------------------------------------------
|
!--------------------------------------------------------------------------------------------------
|
||||||
subroutine debug_info
|
subroutine debug_info
|
||||||
use numerics, only: &
|
|
||||||
nStress, &
|
|
||||||
nState, &
|
|
||||||
nCryst, &
|
|
||||||
nMPstate, &
|
|
||||||
nHomog
|
|
||||||
|
|
||||||
implicit none
|
implicit none
|
||||||
integer(pInt) :: j,integral
|
|
||||||
integer(pLongInt) :: tickrate
|
|
||||||
character(len=1) :: exceed
|
character(len=1) :: exceed
|
||||||
|
|
||||||
call system_clock(count_rate=tickrate)
|
|
||||||
|
|
||||||
!$OMP CRITICAL (write2out)
|
!$OMP CRITICAL (write2out)
|
||||||
debugOutputCryst: if (iand(debug_level(debug_CRYSTALLITE),debug_LEVELBASIC) /= 0) then
|
|
||||||
write(6,'(/,a,/)') ' DEBUG Info (from previous cycle)'
|
|
||||||
write(6,'(a33,1x,i12)') 'total calls to LpAndItsTangent :',debug_cumLpCalls
|
|
||||||
if (debug_cumLpCalls > 0_pInt) then
|
|
||||||
write(6,'(a33,1x,f12.3)') 'total CPU time/s :',&
|
|
||||||
real(debug_cumLpTicks,pReal)/real(tickrate,pReal)
|
|
||||||
write(6,'(a33,1x,f12.6)') 'avg CPU time/microsecs per call :',&
|
|
||||||
real(debug_cumLpTicks,pReal)*1.0e6_pReal/real(tickrate*debug_cumLpCalls,pReal)
|
|
||||||
endif
|
|
||||||
write(6,'(/,a33,1x,i12)') 'total calls to collectDotState :',debug_cumDotStateCalls
|
|
||||||
if (debug_cumdotStateCalls > 0_pInt) then
|
|
||||||
write(6,'(a33,1x,f12.3)') 'total CPU time/s :',&
|
|
||||||
real(debug_cumDotStateTicks,pReal)/real(tickrate,pReal)
|
|
||||||
write(6,'(a33,1x,f12.6)') 'avg CPU time/microsecs per call :',&
|
|
||||||
real(debug_cumDotStateTicks,pReal)*1.0e6_pReal/real(tickrate*debug_cumDotStateCalls,pReal)
|
|
||||||
endif
|
|
||||||
write(6,'(/,a33,1x,i12)') 'total calls to collectDeltaState:',debug_cumDeltaStateCalls
|
|
||||||
if (debug_cumDeltaStateCalls > 0_pInt) then
|
|
||||||
write(6,'(a33,1x,f12.3)') 'total CPU time/s :',&
|
|
||||||
real(debug_cumDeltaStateTicks,pReal)/real(tickrate,pReal)
|
|
||||||
write(6,'(a33,1x,f12.6)') 'avg CPU time/microsecs per call :',&
|
|
||||||
real(debug_cumDeltaStateTicks,pReal)*1.0e6_pReal/real(tickrate*debug_cumDeltaStateCalls,pReal)
|
|
||||||
endif
|
|
||||||
|
|
||||||
integral = 0_pInt
|
|
||||||
write(6,'(3/,a)') 'distribution_StressLoopLp : stress stiffness'
|
|
||||||
do j=1_pInt,nStress+1_pInt
|
|
||||||
if (any(debug_StressLoopLpDistribution(j,:) /= 0_pInt )) then
|
|
||||||
integral = integral + j*(debug_StressLoopLpDistribution(j,1) + debug_StressLoopLpDistribution(j,2))
|
|
||||||
exceed = ' '
|
|
||||||
if (j > nStress) exceed = '+' ! last entry gets "+"
|
|
||||||
write(6,'(i25,a1,i10,1x,i10)') min(nStress,j),exceed,debug_StressLoopLpDistribution(j,1),&
|
|
||||||
debug_StressLoopLpDistribution(j,2)
|
|
||||||
endif
|
|
||||||
enddo
|
|
||||||
write(6,'(a15,i10,2(1x,i10))') ' total',integral,sum(debug_StressLoopLpDistribution(:,1)), &
|
|
||||||
sum(debug_StressLoopLpDistribution(:,2))
|
|
||||||
|
|
||||||
integral = 0_pInt
|
|
||||||
write(6,'(3/,a)') 'distribution_StressLoopLi : stress stiffness'
|
|
||||||
do j=1_pInt,nStress+1_pInt
|
|
||||||
if (any(debug_StressLoopLiDistribution(j,:) /= 0_pInt )) then
|
|
||||||
integral = integral + j*(debug_StressLoopLiDistribution(j,1) + debug_StressLoopLiDistribution(j,2))
|
|
||||||
exceed = ' '
|
|
||||||
if (j > nStress) exceed = '+' ! last entry gets "+"
|
|
||||||
write(6,'(i25,a1,i10,1x,i10)') min(nStress,j),exceed,debug_StressLoopLiDistribution(j,1),&
|
|
||||||
debug_StressLoopLiDistribution(j,2)
|
|
||||||
endif
|
|
||||||
enddo
|
|
||||||
write(6,'(a15,i10,2(1x,i10))') ' total',integral,sum(debug_StressLoopLiDistribution(:,1)), &
|
|
||||||
sum(debug_StressLoopLiDistribution(:,2))
|
|
||||||
|
|
||||||
integral = 0_pInt
|
|
||||||
write(6,'(2/,a)') 'distribution_CrystalliteStateLoop :'
|
|
||||||
do j=1_pInt,nState+1_pInt
|
|
||||||
if (any(debug_StateLoopDistribution(j,:) /= 0)) then
|
|
||||||
integral = integral + j*(debug_StateLoopDistribution(j,1) + debug_StateLoopDistribution(j,2))
|
|
||||||
exceed = ' '
|
|
||||||
if (j > nState) exceed = '+' ! last entry gets "+"
|
|
||||||
write(6,'(i25,a1,i10,1x,i10)') min(nState,j),exceed,debug_StateLoopDistribution(j,1),&
|
|
||||||
debug_StateLoopDistribution(j,2)
|
|
||||||
endif
|
|
||||||
enddo
|
|
||||||
write(6,'(a15,i10,2(1x,i10))') ' total',integral,sum(debug_StateLoopDistribution(:,1)), &
|
|
||||||
sum(debug_StateLoopDistribution(:,2))
|
|
||||||
|
|
||||||
integral = 0_pInt
|
|
||||||
write(6,'(2/,a)') 'distribution_CrystalliteCutbackLoop :'
|
|
||||||
do j=1_pInt,nCryst+1_pInt
|
|
||||||
if (debug_CrystalliteLoopDistribution(j) /= 0) then
|
|
||||||
integral = integral + j*debug_CrystalliteLoopDistribution(j)
|
|
||||||
exceed = ' '
|
|
||||||
if (j > nCryst) exceed = '+'
|
|
||||||
write(6,'(i25,a1,i10)') min(nCryst,j),exceed,debug_CrystalliteLoopDistribution(j)
|
|
||||||
endif
|
|
||||||
enddo
|
|
||||||
write(6,'(a15,i10,1x,i10)') ' total',integral,sum(debug_CrystalliteLoopDistribution)
|
|
||||||
endif debugOutputCryst
|
|
||||||
|
|
||||||
debugOutputHomog: if (iand(debug_level(debug_HOMOGENIZATION),debug_LEVELBASIC) /= 0) then
|
|
||||||
integral = 0_pInt
|
|
||||||
write(6,'(2/,a)') 'distribution_MaterialpointStateLoop :'
|
|
||||||
do j=1_pInt,nMPstate
|
|
||||||
if (debug_MaterialpointStateLoopDistribution(j) /= 0) then
|
|
||||||
integral = integral + j*debug_MaterialpointStateLoopDistribution(j)
|
|
||||||
write(6,'(i25,1x,i10)') j,debug_MaterialpointStateLoopDistribution(j)
|
|
||||||
endif
|
|
||||||
enddo
|
|
||||||
write(6,'(a15,i10,1x,i10)') ' total',integral,sum(debug_MaterialpointStateLoopDistribution)
|
|
||||||
|
|
||||||
integral = 0_pInt
|
|
||||||
write(6,'(2/,a)') 'distribution_MaterialpointCutbackLoop :'
|
|
||||||
do j=1_pInt,nHomog+1_pInt
|
|
||||||
if (debug_MaterialpointLoopDistribution(j) /= 0) then
|
|
||||||
integral = integral + j*debug_MaterialpointLoopDistribution(j)
|
|
||||||
exceed = ' '
|
|
||||||
if (j > nHomog) exceed = '+'
|
|
||||||
write(6,'(i25,a1,i10)') min(nHomog,j),exceed,debug_MaterialpointLoopDistribution(j)
|
|
||||||
endif
|
|
||||||
enddo
|
|
||||||
write(6,'(a15,i10,1x,i10)') ' total',integral,sum(debug_MaterialpointLoopDistribution)
|
|
||||||
endif debugOutputHomog
|
|
||||||
|
|
||||||
debugOutputCPFEM: if (iand(debug_level(debug_CPFEM),debug_LEVELBASIC) /= 0 &
|
debugOutputCPFEM: if (iand(debug_level(debug_CPFEM),debug_LEVELBASIC) /= 0 &
|
||||||
.and. any(debug_stressMinLocation /= 0_pInt) &
|
.and. any(debug_stressMinLocation /= 0_pInt) &
|
||||||
|
|
|
@ -551,9 +551,7 @@ subroutine materialpoint_stressAndItsTangent(updateJaco,dt)
|
||||||
debug_levelExtensive, &
|
debug_levelExtensive, &
|
||||||
debug_levelSelective, &
|
debug_levelSelective, &
|
||||||
debug_e, &
|
debug_e, &
|
||||||
debug_i, &
|
debug_i
|
||||||
debug_MaterialpointLoopDistribution, &
|
|
||||||
debug_MaterialpointStateLoopDistribution
|
|
||||||
|
|
||||||
implicit none
|
implicit none
|
||||||
real(pReal), intent(in) :: dt !< time increment
|
real(pReal), intent(in) :: dt !< time increment
|
||||||
|
@ -722,13 +720,6 @@ subroutine materialpoint_stressAndItsTangent(updateJaco,dt)
|
||||||
hydrogenfluxState(mappingHomogenization(2,i,e))%State( :,mappingHomogenization(1,i,e))! ...internal hydrogen transport state
|
hydrogenfluxState(mappingHomogenization(2,i,e))%State( :,mappingHomogenization(1,i,e))! ...internal hydrogen transport state
|
||||||
materialpoint_subF0(1:3,1:3,i,e) = materialpoint_subF(1:3,1:3,i,e) ! ...def grad
|
materialpoint_subF0(1:3,1:3,i,e) = materialpoint_subF(1:3,1:3,i,e) ! ...def grad
|
||||||
!$OMP FLUSH(materialpoint_subF0)
|
!$OMP FLUSH(materialpoint_subF0)
|
||||||
elseif (materialpoint_requested(i,e)) then steppingNeeded ! already at final time (??)
|
|
||||||
if (iand(debug_level(debug_homogenization), debug_levelBasic) /= 0_pInt) then
|
|
||||||
!$OMP CRITICAL (distributionHomog)
|
|
||||||
debug_MaterialpointLoopDistribution(min(nHomog+1,NiterationHomog)) = &
|
|
||||||
debug_MaterialpointLoopDistribution(min(nHomog+1,NiterationHomog)) + 1
|
|
||||||
!$OMP END CRITICAL (distributionHomog)
|
|
||||||
endif
|
|
||||||
endif steppingNeeded
|
endif steppingNeeded
|
||||||
|
|
||||||
else converged
|
else converged
|
||||||
|
@ -871,8 +862,6 @@ subroutine materialpoint_stressAndItsTangent(updateJaco,dt)
|
||||||
if (materialpoint_converged(i,e)) then
|
if (materialpoint_converged(i,e)) then
|
||||||
if (iand(debug_level(debug_homogenization), debug_levelBasic) /= 0_pInt) then
|
if (iand(debug_level(debug_homogenization), debug_levelBasic) /= 0_pInt) then
|
||||||
!$OMP CRITICAL (distributionMPState)
|
!$OMP CRITICAL (distributionMPState)
|
||||||
debug_MaterialpointStateLoopdistribution(NiterationMPstate) = &
|
|
||||||
debug_MaterialpointStateLoopdistribution(NiterationMPstate) + 1_pInt
|
|
||||||
!$OMP END CRITICAL (distributionMPState)
|
!$OMP END CRITICAL (distributionMPState)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue